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

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 351 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 6 Commits 351 Files Changed 124 +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 868af4a5c6 - Show all commits

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

@ -1315,7 +1315,6 @@ static int brush_asset_save_as_invoke(bContext *C, wmOperator *op, const wmEvent
RNA_string_set(op->ptr, "name", brush->id.name + 2);
/* TODO: add information about the asset library this will be saved to? */
/* TODO: autofocus name? */
return WM_operator_props_dialog_popup(C, op, 400);
}
@ -1331,7 +1330,8 @@ static void BRUSH_OT_asset_save_as(wmOperatorType *ot)
ot->invoke = brush_asset_save_as_invoke;
ot->poll = brush_asset_save_as_poll;
RNA_def_string(ot->srna, "name", nullptr, MAX_NAME, "Name", "Name used to save the brush asset");
ot->prop = RNA_def_string(
ot->srna, "name", nullptr, MAX_NAME, "Name", "Name for the new brush asset");
}
static bool brush_asset_delete_poll(bContext *C)