blender
/
blender
136
417
Fork 599
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Brush Assets: Add catalog option to asset pushing operator #118382

Merged
Hans Goudey merged 26 commits from HooglyBoogly/blender:brush-assets-save-catalog-option into brush-assets-project 2024-02-21 14:03:41 +01:00
Conversation 0 Commits 26 Files Changed 1 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cdd9e2c656 - Show all commits

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

@ -1317,12 +1317,6 @@ static int brush_asset_save_as_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
asset_system::AssetLibrary *library = AS_asset_library_load(
CTX_data_main(C), user_library_to_library_ref(*user_library));
if (!library) {
return OPERATOR_CANCELLED;
}
/* Turn brush into asset if it isn't yet. */
if (!BKE_paint_brush_is_valid_asset(brush)) {
asset::mark_id(&brush->id);
@ -1330,6 +1324,12 @@ static int brush_asset_save_as_exec(bContext *C, wmOperator *op)
}
BLI_assert(BKE_paint_brush_is_valid_asset(brush));
asset_system::AssetLibrary *library = AS_asset_library_load(
CTX_data_main(C), user_library_to_library_ref(*user_library));
if (!library) {
return OPERATOR_CANCELLED;
Brecht Van Lommel commented 2024-02-16 19:40:42 +01:00
Review
Copy Link

Maybe add:

    BKE_report(op->reports, RPT_ERROR, "Failed to load asset library");
Maybe add: ``` BKE_report(op->reports, RPT_ERROR, "Failed to load asset library"); ```
}
/* Add asset to catalog. */
char catalog_path[MAX_NAME];
RNA_string_get(op->ptr, "catalog_path", catalog_path);