Blender Git Loki

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

Merge branch 'id-ensure-unique-memory-address' into undo-experiments

Merge branch 'readfile-rework-refcount-handling' into id-ensure-unique-memory-address

Merge branch 'master' into readfile-rework-refcount-handling

Remove usercount handling from ui stuff in reafile as well.

Fix bad placement of ID refcount recomputation in readfile.

Merge branch 'master' into readfile-rework-refcount-handling

Merge branch 'master' into readfile-rework-refcount-handling

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

Merge branch 'id-ensure-unique-memory-address' into undo-experiments

Merge branch 'readfile-rework-refcount-handling' into id-ensure-unique-memory-address

Merge branch 'libquery-handle-ui-pointers' into readfile-rework-refcount-handling

Merge branch 'master' into libquery-handle-ui-pointers

undoexp: add message when having to actually re-allocate ID during undo.

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

Conflicts:
source/blender/blenloader/intern/readfile.c

properly use 'unique ID allocation' when reading new ID in undo case.

Merge branch 'id-ensure-unique-memory-address' into undo-experiments

Factorize unique ID mem address allocation into a util functions.

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

Conflicts:
source/blender/blenkernel/intern/blendfile.c
source/blender/blenloader/intern/readfile.c

undoexp: transfer set of used ID pointers from old to new bmain in undo case.