blender
/
blender
134
399
Fork 583
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 354 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 354 Files Changed 125 +3 -6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f245bc2b16 - Show all commits

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

@ -1003,13 +1003,10 @@ static int brush_asset_save_as_invoke(bContext *C, wmOperator *op, const wmEvent
/* By default, put the new asset in the same catalog as the existing asset. */
if (!RNA_struct_property_is_set(op->ptr, "catalog_path")) {
const asset_system::CatalogID catalog_id = asset->get_metadata().catalog_id;
const asset_system::AssetCatalog *catalog = library.catalog_service().find_catalog(catalog_id);
if (catalog == nullptr) {
BLI_assert_unreachable();
return OPERATOR_CANCELLED;
const asset_system::CatalogID &id = asset->get_metadata().catalog_id;
if (const asset_system::AssetCatalog *catalog = library.catalog_service().find_catalog(id)) {
RNA_string_set(op->ptr, "catalog_path", catalog->path.c_str());
}
RNA_string_set(op->ptr, "catalog_path", catalog->path.c_str());
}
return WM_operator_props_dialog_popup(C, op, 400, std::nullopt, IFACE_("Save"));