blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 358 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 358 Files Changed 123 +14 -1
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5ce0e4ca17 - Show all commits

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

@ -64,6 +64,7 @@
#include "AS_asset_library.hh"
#include "AS_asset_representation.hh"
#include "UI_interface_icons.hh"
#include "UI_resources.hh"
#include "curves_sculpt_intern.hh"
@ -1264,6 +1265,18 @@ static int brush_asset_delete_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
static int brush_asset_delete_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/)
{
return WM_operator_confirm_ex(
C,
op,
IFACE_("Delete Brush Asset"),
IFACE_("Permanently delete brush asset blend file. This can't be undone."),
IFACE_("Delete"),
ALERT_ICON_WARNING,
false);
}
static void BRUSH_OT_asset_delete(wmOperatorType *ot)
{
ot->name = "Delete Brush Asset";
@ -1271,7 +1284,7 @@ static void BRUSH_OT_asset_delete(wmOperatorType *ot)
ot->idname = "BRUSH_OT_asset_delete";
ot->exec = brush_asset_delete_exec;
ot->invoke = WM_operator_confirm;
ot->invoke = brush_asset_delete_invoke;
ot->poll = brush_asset_delete_poll;
}