Blender Git Loki

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

Conflicts:
source/blender/blenkernel/intern/lib_query.c

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

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

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

Fix previous commit.

undoexp: Update for 'unique ID memaddress' change.

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

Initial rough idea of 'unique ID address' change.

Goal of this code is to ensure we only ever use a given memory address
once, for all IDs generated in a bmain.

This is crucial if we want to be able to use ID pointers instead of ID
names in undo speedup work, when re-using existing IDs.

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

Fix after merge of master.

Merge branch 'master' into undo-experiments

Merge commit 'ddad044cfe13' into undo-experiments

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 'master' into undo-experiments

Merge branch 'master' into undo-experiments

Merge branch 'readfile_factorize_common_id_processing' into undo-experiments

Merge branch 'master' into readfile_factorize_common_id_processing