Blender Git Commits

Merge branch 'master' into libquery-recursive

Fix for new libquery callback API.

Merge branch 'libquery-recursive' into id-remap

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

Rework library_query foreach looper - add optional recursivity.

This commit:
* Fixes bad handling of 'stop iteration' (by adding a status flag, so that we can actually
stop in helper functions too, and jumping to a finalize label instead of raw return, to
allow propper clean up).
* Adds optional recursion into 'ID tree' - callback can also decide to exclude current id_pp
from recursion. Note that this implies 'readonly', modifying IDs while recursing is not
something we want to support!
* Changes callback signature/expected behavior: return behavior is now handled through flags,
and 'parent' ID of id_pp is also passed (since it may not always be root id anymore).

Used this new recursive behavior in ID preview generation as an example, still needs more testing!

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Conflicts:
source/blender/editors/space_outliner/outliner_tools.c

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

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

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Fix & cleanup in outliner area.

Now all new entries in items' menus should behave correctly!

Fix some bad id->flag/tag mismatch from not-so-recent merge with master...

Fix assert when deleting obdata.

Issue here is again with NEVER_NULL usages: obdata (& co) would be dereferenced twice.

I'm not totally happy with this solution, ideally remap should never leave Main
in invalid state, but for now it will do...

Fix a crash when deleting a lib featuring some proxyob source...

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/BKE_library_query.h
source/blender/blenkernel/intern/library_query.c
source/blender/makesrna/intern/rna_ID.c