griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-10-11 11:27:11 +11:00
parent 07f298c1e5 6fe7203d1a
commit 9e587ce9c7
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/sculpt_paint/brush_asset_ops.cc
View File

@@ -174,6 +174,11 @@ static asset_system::AssetCatalog &asset_library_ensure_catalog(
return *library.catalog_service().create_catalog(path);
}
#ifdef __GNUC__ /* Suppress warning for GCC-14.2. */
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdangling-reference"
#endif
static asset_system::AssetCatalog &asset_library_ensure_catalogs_in_path(
asset_system::AssetLibrary &library, const asset_system::AssetCatalogPath &path)
{
@@ -187,6 +192,10 @@ static asset_system::AssetCatalog &asset_library_ensure_catalogs_in_path(
return *library.catalog_service().find_catalog_by_path(path);
}
#ifdef __GNUC__
# pragma GCC diagnostic pop
#endif
static void show_catalog_in_asset_shelf(const bContext &C, const StringRefNull catalog_path)
{
/* Enable catalog in all visible asset shelves. */