Blender Git Loki

Git Commits -> Revision adaf4f5

Revision adaf4f5 by Julian Eisel (master)
September 29, 2021, 11:18 (GMT)
Support loading catalogs in the Current File asset library

When the Asset Browser shows the "Current File" asset library, now it
also attempts to load an asset catalog definition file from location of
the current .blend file. This happens as follows:
* First, see if the file is inside of an asset library that is "mounted" in the
Preferences. Load the catalogs from there if so.
* Otherwise, if the file is saved, load the catalogs from the directory the
file is saved in.
* If the file is not saved, no catalogs will be loaded.

Unit tests are being worked on in D12689.

Creating catalogs from the "Current File" asset library still doesn't work, as
the asset catalog service doesn't construct an in-memory catalog definition
file in that case yet.

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

Commit Details:

Full Hash: adaf4f56e1ed2d8ff55be4681838c9705da022ad
Parent Commit: 78b9a8c
Lines Changed: +98, -21

4 Modified Paths:

/source/blender/blenkernel/BKE_asset_library.h (+37, -0) (Diff)
/source/blender/blenkernel/intern/asset_catalog.cc (+17, -19) (Diff)
/source/blender/blenkernel/intern/asset_library.cc (+23, -0) (Diff)
/source/blender/editors/space_file/filelist.c (+21, -2) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021