Blender Git Loki

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

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

Fixes to Session uuids.

Do not assign new session uuid if ID already has one.
Only re-use existing session uuids from read IDs in undo case. Regular
file loading requires a full reset of the uuids.

Some more debug prints.

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

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_ID.h

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

Fix mistake in ghash handling code in new id_map' uuid thing.

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

Forgot to free new id_map uuid ghash in previous commit.

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

Add uuid support to main_idmap.

Merge branch 'master' into uuid-id

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

Add an session-wise uuid integer to IDs.

This is intended to provide undo with a way to find IDs across several
'memory realms' (undo speedup project).

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

Fix for undoing 'unique id memaddress' branch.

Merge branch 'master' into uuid-undo-experiments

Revert "Initial rough idea of 'unique ID address' change."

This reverts commit 587155745b3b6c4949dd0b155abf24405b436c24.

Revert "Rework the whole unique ID system to also store ID addresses history in Main's mapping."

This reverts commit 726e6972160159cc9d5b2be9cfb618f7362acc81.

Cleanup outdated comment.