Blender Git Loki

Merge branch 'asset-engine' into asset-experiments

Merge branch 'id-remap' into asset-experiments

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

Fix remaining cases of datablocks' BKE_foo_free() touching usercount of their IDs.

Note that a few sub-data (like animdata) needs to keep option to unlink their
own ID usages themselves for now, this is not ideal, but need some more time
to mumble on this and find an elegant fix. Nothing blocking here anyway.

Merge branch 'master' into asset-engine

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 bad handling of RegionView3Ds in View3D ID remap callback.

Found more id-remap missing cases in spaces (new(?) ads of anim editors).

Fix missing mask ID pointer update in Clip/Image spaces' remap callbacks.

Finish TODOs related to buttons space and ID remapping.

Fix reload/relocate trying to use invalid lib path.

Fix broken compilation after recent refactor.

Cleanup from review comments.

Merge branch 'master' into id-remap

Cleanup: headers

Move remapping functions into BKE_library_remap.h

This is done since remapping is quite an involved process.

Merge branch 'master' into id-remap

Fixes/updates needed to make asset reload work with new virtual lib stuff.

Merge branch 'id-remap' into asset-experiments