Blender Git Loki

Merge branch 'uuid-undo-experiments' into uuid-undo-experiments-swap-reread-datablocks

Merge branch 'master' into uuid-undo-experiments

Merge branch 'uuid-undo-experiments' into uuid-undo-experiments-swap-reread-datablocks

Merge branch 'uuid-id' into uuid-undo-experiments

Make session-wise uuid increment atomic, and reset it on file load.

Reseting on file load should avoid almost all possible case of counter
overflow, and makes sense anyway, since loading a file fully
resets/restarts an editing session.

Merge branch 'uuid-undo-experiments' into uuid-undo-experiments-swap-reread-datablocks

Merge branch 'uuid-id' into uuid-undo-experiments

Merge branch 'master' into uuid-id

Cleanup from review.

Merge branch 'uuid-undo-experiments' into uuid-undo-experiments-swap-reread-datablocks

Merge branch 'uuid-id' into uuid-undo-experiments

Forgot some part of renaming cleanup in previous commit.

Merge branch 'uuid-id' into uuid-undo-experiments

Safeguard against overflow of static uuid counter.

Some changes from review.

Merge branch 'uuid-undo-experiments' into uuid-undo-experiments-swap-reread-datablocks

Fix stupid mistake in key generation for temp deg storage.

Merge branch 'uuid-undo-experiments' into uuid-undo-experiments-swap-reread-datablocks

Merge branch 'uuid-id' into uuid-undo-experiments

Merge branch 'master' into uuid-id

Conflicts:
source/blender/blenkernel/BKE_main_idmap.h