blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 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 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b4d7352a17 - Show all commits

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

@ -204,14 +204,14 @@ void AssetViewItem::build_grid_tile(uiLayout &layout) const
void AssetViewItem::build_context_menu(bContext &C, uiLayout &column) const
{
const AssetView &asset_view = dynamic_cast<AssetView &>(get_view());
const AssetView &asset_view = dynamic_cast<const AssetView &>(get_view());
const AssetShelfType &shelf_type = *asset_view.shelf_.type;
shelf_type.draw_context_menu(&C, &shelf_type, &asset_, &column);
}
bool AssetViewItem::is_filtered_visible() const
JulianEisel marked this conversation as resolved Outdated
Campbell Barton commented 2023-07-20 13:57:39 +02:00
Outdated
Review
Copy Link

This is crashing on a simple test (default sculpt brush made into an asset).

  • Default blend file (w/ experimental asset features enabled).
  • Enter sculpt mode.
  • Make default sculpt brush into an asset (from the properties toolbar).
  • RMB in the asset shelf.
  • Crash.
This is crashing on a simple test (default sculpt brush made into an asset). - Default blend file (w/ experimental asset features enabled). - Enter sculpt mode. - Make default sculpt brush into an asset (from the properties toolbar). - RMB in the asset shelf. - Crash.
{
const AssetView &asset_view = dynamic_cast<AssetView &>(get_view());
const AssetView &asset_view = dynamic_cast<const AssetView &>(get_view());
if (asset_view.search_string[0] == '\0') {
return true;
}