blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 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 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 32308f9db0 - Show all commits

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

@ -1263,7 +1263,7 @@ static int brush_asset_save_as_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
/* Check if belongs to an editable blend file. */
/* Check if the asset belongs to an editable blend file. */
if (paint->brush_asset_reference && BKE_paint_brush_is_valid_asset(brush)) {
if (!asset_is_editable(*paint->brush_asset_reference)) {
BKE_report(op->reports, RPT_ERROR, "Asset blend file is not editable");
@ -1329,7 +1329,7 @@ static int brush_asset_save_as_invoke(bContext *C, wmOperator *op, const wmEvent
RNA_string_set(op->ptr, "name", brush->id.name + 2);
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"); ```
return WM_operator_props_dialog_popup(C, op, 400);
return WM_operator_props_dialog_popup(C, op, 400, std::nullopt, IFACE_("Save"));
}
static const EnumPropertyItem *rna_asset_library_reference_itemf(bContext * /*C*/,