Blender Git Loki

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

Merge branch 'libquery-handle-ui-pointers' into undo-experiments

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

Merge commit 'ddad044cfe13' into libquery-handle-ui-pointers

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

Merge commit '633951f9be06' into undo-experiments-swap-reread-datablocks

Fix after merge of master.

Merge branch 'master' into undo-experiments

Merge commit 'ddad044cfe13' into undo-experiments

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

Merge branch 'libquery-handle-ui-pointers' into undo-experiments

libquery: add optional handling of 'UI' ID pointers.

Handling those through different ways /might/ be needed sometimes, but
in most case this is just a nest of issues, since you can easily forget
to take them into account.

Note that this should be a 'non-functional' change, as this new behavior
is not used anywhere yet.

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

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

Merge branch 'master' into undo-experiments

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

Merge branch 'master' into undo-experiments

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

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

Merge branch 'readfile_factorize_common_id_processing' into undo-experiments

Merge branch 'master' into readfile_factorize_common_id_processing