Blender Git Commits

Merge branch 'libquery-recursive' into id-remap

Merge branch 'master' into id-remap

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, would obviously be committed separately.

Reviewers: sergey, campbellbarton

Differential Revision: https://developer.blender.org/D1869

Finish RNA flags for asset UUIDs!

Merge branch 'libquery-recursive' into asset-engine

Merge branch 'master' into asset-engine

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

Merge branch 'libquery-recursive' into id-remap

Merge branch 'master' into id-remap

Merge branch 'master' into libquery-recursive

More WIP work towards designing Updated feature for assets/engines.

Merge branch 'asset-engine' into asset-experiments

Conflicts:
source/creator/creator.c

Merge branch 'id-remap' into asset-experiments

Merge branch 'libquery-recursive' into asset-experiments

Merge branch 'master' into asset-experiments

Conflicts:
source/creator/creator.c

Slightly modified way to check for assets on loadfile.

Since we now build a list of assets and their dependencies in Library datablocks, use it!

Merge branch 'libquery-recursive' into asset-engine

Merge branch 'master' into asset-engine

Merge branch 'libquery-recursive' into id-remap

Merge branch 'master' into id-remap

Merge branch 'master' into libquery-recursive