blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 770 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 30 Commits 399 Files Changed - +10 -8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aad8edbb1f - Show all commits

18
source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc
View File

@ -152,16 +152,18 @@ static void catalog_selector_panel_draw(const bContext *C, Panel *panel)
uiLayout *layout = panel->layout;
uiBlock *block = uiLayoutGetBlock(layout);
uiLayoutSetEmboss(layout, UI_EMBOSS_NONE);
uiItemL(layout, IFACE_("Catalogs"), ICON_NONE);
if (library && shelf_settings) {
ui::AbstractTreeView *tree_view = UI_block_add_view(
*block,
"asset catalog tree view",
std::make_unique<AssetCatalogSelectorTree>(*library, *shelf_settings));
ui::TreeViewBuilder::build_tree_view(*tree_view, *layout);
if (!library || !shelf_settings) {
return;
}
ui::AbstractTreeView *tree_view = UI_block_add_view(
*block,
"asset catalog tree view",
std::make_unique<AssetCatalogSelectorTree>(*library, *shelf_settings));
ui::TreeViewBuilder::build_tree_view(*tree_view, *layout);
}
void catalog_selector_panel_register(ARegionType *region_type)