Blender Git Loki

Git Commits -> Revision 9d9f205

Revision 9d9f205 by Julian Eisel (master)
September 29, 2021, 15:15 (GMT)
Asset Browser: Initial Asset Catalog UI

The Asset Browser now displays a tree with asset catalogs in the left
sidebar.
This replaces the asset categories. It uses the new UI tree-view API
(https://wiki.blender.org/wiki/Source/Interface/Views#Tree-View).
Buttons are displayed for adding and removing of catalogs. Parent items
can be collapsed, but the collapsed/uncollapsed state is not stored in
files yet.
Note that edits to catalogs (e.g. new or removed catalogs) are only
written to the asset library's catalog definition files when saving a
.blend.

In the "Current File" asset library, we try to show asset catalogs from
a parent asset library, or if that fails, from the directory the file is
stored in. See adaf4f56e1ed.

There are plenty of TODOs and smaller glitches to be fixed still. Plus a
UI polishing pass should be done.

Important missing UI features:
* Dragging assets into catalogs (WIP, close to being ready).
* Renaming catalogs
* Proper handling of catalogs in the "Current File" asset library
(currently not working well).

The "Current File" asset library is especially limited still. Since this
is the only place where you can assign assets to a catalog, this makes
the catalogs very cumbersome in general. To assign an asset to a
catalog, one has to manually copy the Catalog ID (a random hash like
number) to the asset metadata through a temporary UI in the Asset
Browser Sidebar. These limitations should be addressed over the next few
days, they are high priority.

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

Commit Details:

Full Hash: 9d9f205dc4a9ddae3d654c64894eaca8443cacc0
Parent Commit: df9120b
Lines Changed: +638, -107

3 Added Paths:

/source/blender/editors/asset/ED_asset_catalog.hh (+35, -0) (View)
/source/blender/editors/asset/intern/asset_catalog.cc (+87, -0) (View)
/source/blender/editors/space_file/asset_catalog_tree_view.cc (+230, -0) (View)

20 Modified Paths:

/release/scripts/modules/bpy_extras/asset_utils.py (+2, -9) (Diff)
/release/scripts/startup/bl_ui/space_filebrowser.py (+0, -25) (Diff)
/source/blender/blenkernel/BKE_asset_library.hh (+4, -0) (Diff)
/source/blender/blenkernel/intern/asset_library.cc (+23, -0) (Diff)
/source/blender/editors/asset/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/asset/intern/asset_ops.cc (+88, -0) (Diff)
/source/blender/editors/include/ED_fileselect.h (+1, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+2, -1) (Diff)
/source/blender/editors/include/UI_tree_view.hh (+6, -0) (Diff)
/source/blender/editors/interface/interface.c (+9, -0) (Diff)
/source/blender/editors/interface/tree_view.cc (+16, -3) (Diff)
/source/blender/editors/space_file/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/space_file/filelist.c (+52, -0) (Diff)
/source/blender/editors/space_file/filelist.h (+7, -0) (Diff)
/source/blender/editors/space_file/filesel.c (+10, -4) (Diff)
/source/blender/editors/space_file/file_intern.h (+10, -0) (Diff)
/source/blender/editors/space_file/file_panels.c (+32, -0) (Diff)
/source/blender/editors/space_file/space_file.c (+7, -2) (Diff)
/source/blender/makesdna/DNA_space_types.h (+14, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+0, -62) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021