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

2
source/blender/editors/asset/intern/asset_shelf_asset_view.cc
View File

@ -102,8 +102,6 @@ void AssetView::build_items()
}
ED_assetlist_iterate(library_ref_, [&](AssetHandle asset_handle) {
/* TODO calling a (.py defined) callback for every asset isn't exactly great. Should be a
* temporary solution until there is proper filtering by asset traits. */
if (shelf_.type->asset_poll && !shelf_.type->asset_poll(shelf_.type, &asset_handle)) {
return true;
}