blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 370 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 370 Files Changed 81 +7 -7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f8fd30f03 - Show all commits

10
source/blender/editors/sculpt_paint/paint_ops.cc
View File

@ -1031,10 +1031,10 @@ static const bUserAssetLibrary *get_asset_library_from_prop(PointerRNA &ptr)
static asset_system::AssetCatalog &asset_library_ensure_catalog( static asset_system::AssetCatalog &asset_library_ensure_catalog(
asset_system::AssetLibrary &library, const asset_system::AssetCatalogPath &path) asset_system::AssetLibrary &library, const asset_system::AssetCatalogPath &path)
{ {
if (asset_system::AssetCatalog *catalog = library.catalog_service->find_catalog_by_path(path)) { if (asset_system::AssetCatalog *catalog = library.catalog_service().find_catalog_by_path(path)) {
return *catalog; return *catalog;
} }
return *library.catalog_service->create_catalog(path); return *library.catalog_service().create_catalog(path);
} }
static asset_system::AssetCatalog &asset_library_ensure_catalogs_in_path( static asset_system::AssetCatalog &asset_library_ensure_catalogs_in_path(
@ -1047,7 +1047,7 @@ static asset_system::AssetCatalog &asset_library_ensure_catalogs_in_path(
asset_library_ensure_catalog(library, parent / component_name); asset_library_ensure_catalog(library, parent / component_name);
parent = parent / component_name; parent = parent / component_name;
}); });
return *library.catalog_service->find_catalog_by_path(path); return *library.catalog_service().find_catalog_by_path(path);
} }
static AssetLibraryReference user_library_to_library_ref(const bUserAssetLibrary &user_library) static AssetLibraryReference user_library_to_library_ref(const bUserAssetLibrary &user_library)
@ -1109,7 +1109,7 @@ static int brush_asset_save_as_exec(bContext *C, wmOperator *op)
const asset_system::CatalogID catalog_id = catalog.catalog_id; const asset_system::CatalogID catalog_id = catalog.catalog_id;
const std::string catalog_simple_name = catalog.simple_name; const std::string catalog_simple_name = catalog.simple_name;
library->catalog_service->write_to_disk(filepath); library->catalog_service().write_to_disk(filepath);
/* Save to asset library. */ /* Save to asset library. */
Main *asset_main = BKE_main_from_id(bmain, &brush->id); Main *asset_main = BKE_main_from_id(bmain, &brush->id);
@ -1199,7 +1199,7 @@ static void visit_asset_catalog_for_search_fn(
return; return;
} }
const asset_system::AssetCatalogTree &full_tree = library->catalog_service->catalog_tree(); const asset_system::AssetCatalogTree &full_tree = library->catalog_service().catalog_tree();
full_tree.foreach_item([&](const asset_system::AssetCatalogTreeItem &item) { full_tree.foreach_item([&](const asset_system::AssetCatalogTreeItem &item) {
visit_fn(StringPropertySearchVisitParams{item.catalog_path().str(), std::nullopt}); visit_fn(StringPropertySearchVisitParams{item.catalog_path().str(), std::nullopt});
}); });

4
source/blender/editors/space_file/filelist.cc
View File

@ -590,9 +590,9 @@ static int compare_asset_catalog(void *user_data, const void *a1, const void *a2
const asset_system::AssetLibrary &asset_library1 = entry1->asset->owner_asset_library(); const asset_system::AssetLibrary &asset_library1 = entry1->asset->owner_asset_library();
const asset_system::AssetLibrary &asset_library2 = entry2->asset->owner_asset_library(); const asset_system::AssetLibrary &asset_library2 = entry2->asset->owner_asset_library();
const asset_system::AssetCatalog *catalog1 = asset_library1.catalog_service->find_catalog( const asset_system::AssetCatalog *catalog1 = asset_library1.catalog_service().find_catalog(
entry1->asset->get_metadata().catalog_id); entry1->asset->get_metadata().catalog_id);
const asset_system::AssetCatalog *catalog2 = asset_library2.catalog_service->find_catalog( const asset_system::AssetCatalog *catalog2 = asset_library2.catalog_service().find_catalog(
entry2->asset->get_metadata().catalog_id); entry2->asset->get_metadata().catalog_id);
/* Always keep assets without catalog last. */ /* Always keep assets without catalog last. */