Blender Git Commits

Merge branch 'master' into asset-engine

Merge branch 'libquery-recursive' into id-remap

Merge branch 'master' into id-remap

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

Merge branch 'master' into libquery-recursive

Merge branch 'master' into libquery-recursive

Merge branch 'libquery-recursive' into asset-engine

Merge branch 'master' into asset-engine

Merge branch 'libquery-recursive' into id-remap

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

Merge branch 'master' into id-remap

Cleanup (remove some useless diff compared to master).

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

Merge branch 'libquery-recursive' into asset-engine

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 asset-engine

Merge branch 'master' into asset-engine

Merge branch 'master' into id-remap

Merge branch 'master' into asset-engine

WIP Add asset sub-data dependency info.

We need that info (knowing which non-asset IDs are used by which asset-IDs),
otherwise managing reloading, updates etc. of assets would be impossible
(or rather, would leave a mess of unused IDs behind them).
Only partially done, non-functional yet.

This commit also adds asset repository references in libraries.