Brush Assets: Show new catalog in asset shelf when duplicating brush #120531

Hans Goudey · 2024-04-11T17:24:09+02:00

Hans Goudey commented

2024-04-11 17:24:09 +02:00

When adding a new brush asset in a new catalog,
make it visible in the currently active asset shelf.

When adding a new brush asset in a new catalog, make it visible in the currently active asset shelf.

Hans Goudey added 1 commit 2024-04-11 17:24:18 +02:00

d4d25d4276 Brush Assets: Show new catalog in asset shelf when duplicating brush

Hans Goudey requested review from Julian Eisel 2024-04-11 17:24:30 +02:00

Hans Goudey referenced this pull request

2024-04-11 17:40:27 +02:00

Brush Assets Tasks #116337

Hans Goudey added this to the Brush Assets & Asset Shelf project 2024-04-17 17:23:12 +02:00

Hans Goudey added 1 commit 2024-04-23 19:51:48 +02:00

9fcb82390d Merge branch 'brush-assets-project' into brush-assets-duplicate-show-catalog

Julian Eisel requested changes 2024-04-23 21:06:59 +02:00

Dismissed

source/blender/editors/sculpt_paint/paint_ops.cc Outdated

						
				@ -866,6 +867,28 @@ static AssetLibraryReference user_library_to_library_ref(const bUserAssetLibrary

				  return library_ref;

				}

				static void show_catalog_in_asset_shelf(const bContext &C, const StringRefNull catalog_path)

Julian Eisel commented

2024-04-17 18:22:56 +02:00

Code here is largely a duplicate of active_shelf_from_area(), would rather share this.

Code here is largely a duplicate of `active_shelf_from_area()`, would rather share this.

HooglyBoogly marked this conversation as resolved

source/blender/editors/sculpt_paint/paint_ops.cc Outdated

						
				@ -887,0 +891,4 @@

				  if (!area) {

				    return;

				  }

				  const ARegion *shelf_region = BKE_area_find_region_type(area, RGN_TYPE_ASSET_SHELF);

Julian Eisel commented

2024-04-23 21:04:49 +02:00

Code here is duplicated from active_shelf_from_area(), better make this shared.

Code here is duplicated from `active_shelf_from_area()`, better make this shared.

HooglyBoogly marked this conversation as resolved

source/blender/editors/sculpt_paint/paint_ops.cc Outdated

						
				@ -887,0 +899,4 @@

				    return;

				  }

				  const RegionAssetShelf &shelf = *static_cast<const RegionAssetShelf *>(shelf_region->regiondata);

				  if (!BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled(

Julian Eisel commented

2024-04-23 21:03:34 +02:00

This does assume that the currently active shelf displays brushes, which may not be true. I'm not sure how we could improve this though since there's nothing to explicitly connect this to a certain asset shelf. If we had traits we could check that the asset shelf traits include "brush". I guess for now the asset shelf should hide empty catalog tabs.
Nothing for you to do, just noting as a weakness.

This does assume that the currently active shelf displays brushes, which may not be true. I'm not sure how we could improve this though since there's nothing to explicitly connect this to a certain asset shelf. If we had traits we could check that the asset shelf traits include "brush". I guess for now the asset shelf should hide empty catalog tabs. Nothing for you to do, just noting as a weakness.

Hans Goudey commented

2024-04-26 18:27:30 +02:00

Yeah, maybe that will get clearer if we ever actually have two conflicting asset shelf types here.