blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-05-08 18:57:29 +10:00
parent 3daf1b151b 7f5570ceff
commit fc3cc2ca3a
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/sculpt_paint/sculpt_face_set.c
View File

@ -255,7 +255,7 @@ static EnumPropertyItem prop_sculpt_face_set_create_types[] = {
{0, NULL, 0, NULL, NULL},
};
static int sculpt_face_set_create_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
static int sculpt_face_set_create_exec(bContext *C, wmOperator *op)
{
Object *ob = CTX_data_active_object(C);
SculptSession *ss = ob->sculpt;
@ -357,7 +357,7 @@ void SCULPT_OT_face_sets_create(wmOperatorType *ot)
ot->description = "Create a new Face Set";
/* api callbacks */
ot->invoke = sculpt_face_set_create_invoke;
ot->exec = sculpt_face_set_create_exec;
ot->poll = SCULPT_mode_poll;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@ -597,7 +597,7 @@ static void sculpt_face_sets_init_loop(Object *ob, const int mode)
BM_mesh_free(bm);
}
static int sculpt_face_set_init_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
static int sculpt_face_set_init_exec(bContext *C, wmOperator *op)
{
Object *ob = CTX_data_active_object(C);
SculptSession *ss = ob->sculpt;
@ -690,7 +690,7 @@ void SCULPT_OT_face_sets_init(wmOperatorType *ot)
ot->description = "Initializes all Face Sets in the mesh";
/* api callbacks */
ot->invoke = sculpt_face_set_init_invoke;
ot->exec = sculpt_face_set_init_exec;
ot->poll = SCULPT_mode_poll;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@ -756,9 +756,7 @@ static EnumPropertyItem prop_sculpt_face_sets_change_visibility_types[] = {
{0, NULL, 0, NULL, NULL},
};
static int sculpt_face_sets_change_visibility_invoke(bContext *C,
wmOperator *op,
const wmEvent *UNUSED(event))
static int sculpt_face_sets_change_visibility_exec(bContext *C, wmOperator *op)
{
Object *ob = CTX_data_active_object(C);
SculptSession *ss = ob->sculpt;
@ -891,7 +889,7 @@ void SCULPT_OT_face_sets_change_visibility(wmOperatorType *ot)
ot->description = "Change the visibility of the Face Sets of the sculpt";
/* Api callbacks. */
ot->invoke = sculpt_face_sets_change_visibility_invoke;
ot->exec = sculpt_face_sets_change_visibility_exec;
ot->poll = SCULPT_mode_poll;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@ -904,9 +902,7 @@ void SCULPT_OT_face_sets_change_visibility(wmOperatorType *ot)
"");
}
static int sculpt_face_sets_randomize_colors_invoke(bContext *C,
wmOperator *UNUSED(op),
const wmEvent *UNUSED(event))
static int sculpt_face_sets_randomize_colors_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *ob = CTX_data_active_object(C);
@ -958,7 +954,7 @@ void SCULPT_OT_face_sets_randomize_colors(wmOperatorType *ot)
ot->description = "Generates a new set of random colors to render the Face Sets in the viewport";
/* Api callbacks. */
ot->invoke = sculpt_face_sets_randomize_colors_invoke;
ot->exec = sculpt_face_sets_randomize_colors_exec;
ot->poll = SCULPT_mode_poll;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;