blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 774 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 - +22 -4
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0adb48f9fa - Show all commits

26
source/blender/editors/asset/intern/asset_shelf.cc
View File

@ -315,6 +315,17 @@ static void asset_shelf_region_snap_height_to_closest(ScrArea *area, ARegion *re
}
}
/**
* The asset shelf always uses the "All" library for now.
*/
static const AssetLibraryReference &asset_shelf_library_ref()
{
static AssetLibraryReference all_library_ref = {};
all_library_ref.type = ASSET_LIBRARY_ALL;
all_library_ref.custom_library_index = -1;
return all_library_ref;
}
void ED_asset_shelf_region_layout(const bContext *C, ARegion *region, AssetShelfHook *shelf_hook)
{
const SpaceLink *space = CTX_wm_space_data(C);
@ -325,9 +336,7 @@ void ED_asset_shelf_region_layout(const bContext *C, ARegion *region, AssetShelf
return;
}
AssetLibraryReference all_library_ref = {};
all_library_ref.type = ASSET_LIBRARY_ALL;
all_library_ref.custom_library_index = -1;
const AssetLibraryReference &library_ref = asset_shelf_library_ref();
uiBlock *block = UI_block_begin(C, region, __func__, UI_EMBOSS);
@ -344,7 +353,7 @@ void ED_asset_shelf_region_layout(const bContext *C, ARegion *region, AssetShelf
0,
style);
shelf::build_asset_view(*layout, all_library_ref, *active_shelf, *C, *region);
shelf::build_asset_view(*layout, library_ref, *active_shelf, *C, *region);
int layout_height;
UI_block_layout_resolve(block, nullptr, &layout_height);
@ -409,6 +418,7 @@ int ED_asset_shelf_context(const bContext *C,
{
static const char *context_dir[] = {
"asset_shelf",
"asset_library_ref",
"active_file", /* XXX yuk... */
nullptr,
};
@ -426,6 +436,14 @@ int ED_asset_shelf_context(const bContext *C,
return CTX_RESULT_OK;
}
if (CTX_data_equals(member, "asset_library_ref")) {
CTX_data_pointer_set(result,
&screen->id,
&RNA_AssetLibraryReference,
JulianEisel marked this conversation as resolved Outdated
Brecht Van Lommel commented 2023-07-18 18:12:03 +02:00
Outdated
Review
Copy Link

Don't abbreviate things in the public API like this, ref -> reference.

Don't abbreviate things in the public API like this, ref -> reference.
Julian Eisel commented 2023-07-27 14:07:15 +02:00
Outdated
Review
Copy Link

We already use "asset_library_ref" in a number of other places in the API. Noted in #102877 as potential 4.0 change.

We already use `"asset_library_ref"` in a number of other places in the API. Noted in #102877 as potential 4.0 change.
Brecht Van Lommel commented 2023-07-27 14:51:28 +02:00
Outdated
Review
Copy Link

Ok, I would not break API compatibility over something minor like this.

Ok, I would not break API compatibility over something minor like this.
const_cast<AssetLibraryReference *>(&asset_shelf_library_ref()));
return CTX_RESULT_OK;
}
/* XXX hack. Get the asset from the active item, but needs to be the file... */
if (CTX_data_equals(member, "active_file")) {
const ARegion *region = CTX_wm_region(C);