griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use _exec suffix for operator callbacks

Browse Source 
This was already the case for all but a few places.
This commit is contained in:
Campbell Barton
2023-06-24 18:56:25 +10:00
parent b9bf639ba4
commit b810fd75a4
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/io/io_ply_ops.cc
View File

@@ -230,7 +230,7 @@ static int wm_ply_import_invoke(bContext *C, wmOperator *op, const wmEvent *even
return WM_operator_filesel(C, op, event);
}
static int wm_ply_import_execute(bContext *C, wmOperator *op)
static int wm_ply_import_exec(bContext *C, wmOperator *op)
{
PLYImportParams params{};
params.forward_axis = eIOAxis(RNA_enum_get(op->ptr, "forward_axis"));
@@ -283,7 +283,7 @@ void WM_OT_ply_import(wmOperatorType *ot)
ot->idname = "WM_OT_ply_import";
ot->invoke = wm_ply_import_invoke;
ot->exec = wm_ply_import_execute;
ot->exec = wm_ply_import_exec;
ot->poll = WM_operator_winactive;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_PRESET;

4
source/blender/editors/io/io_stl_ops.cc
View File

@@ -29,7 +29,7 @@ static int wm_stl_import_invoke(bContext *C, wmOperator *op, const wmEvent *even
return WM_operator_filesel(C, op, event);
}
static int wm_stl_import_execute(bContext *C, wmOperator *op)
static int wm_stl_import_exec(bContext *C, wmOperator *op)
{
STLImportParams params{};
params.forward_axis = eIOAxis(RNA_enum_get(op->ptr, "forward_axis"));
@@ -95,7 +95,7 @@ void WM_OT_stl_import(wmOperatorType *ot)
ot->idname = "WM_OT_stl_import";
ot->invoke = wm_stl_import_invoke;
ot->exec = wm_stl_import_execute;
ot->exec = wm_stl_import_exec;
ot->poll = WM_operator_winactive;
ot->check = wm_stl_import_check;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_PRESET;

6
source/blender/editors/object/object_bake_simulation.cc
View File

@@ -362,7 +362,7 @@ static void bake_simulation_job_endjob(void *customdata)
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, nullptr);
}
static int bake_simulation_execute(bContext *C, wmOperator *op)
static int bake_simulation_exec(bContext *C, wmOperator *op)
{
wmWindowManager *wm = CTX_wm_manager(C);
Scene *scene = CTX_data_scene(C);
@@ -556,7 +556,7 @@ static int bake_simulation_invoke(bContext *C, wmOperator *op, const wmEvent * /
if (has_existing_bake_data) {
return WM_operator_confirm_message(C, op, "Overwrite existing bake data");
}
return bake_simulation_execute(C, op);
return bake_simulation_exec(C, op);
}
static int bake_simulation_modal(bContext *C, wmOperator * /*op*/, const wmEvent * /*event*/)
@@ -647,7 +647,7 @@ void OBJECT_OT_simulation_nodes_cache_bake(wmOperatorType *ot)
ot->description = "Bake simulations in geometry nodes modifiers";
ot->idname = __func__;
ot->exec = bake_simulation_execute;
ot->exec = bake_simulation_exec;
ot->invoke = bake_simulation_invoke;
ot->modal = bake_simulation_modal;
ot->poll = bake_simulation_poll;

4
source/blender/makesrna/intern/rna_wm.c
View File

@@ -1306,7 +1306,7 @@ static bool rna_operator_poll_cb(bContext *C, wmOperatorType *ot)
return visible;
}
static int rna_operator_execute_cb(bContext *C, wmOperator *op)
static int rna_operator_exec_cb(bContext *C, wmOperator *op)
{
extern FunctionRNA rna_Operator_execute_func;
@@ -1600,7 +1600,7 @@ static StructRNA *rna_Operator_register(Main *bmain,
dummy_ot.rna_ext.free = free;
dummy_ot.pyop_poll = (have_function[0]) ? rna_operator_poll_cb : NULL;
dummy_ot.exec = (have_function[1]) ? rna_operator_execute_cb : NULL;
dummy_ot.exec = (have_function[1]) ? rna_operator_exec_cb : NULL;
dummy_ot.check = (have_function[2]) ? rna_operator_check_cb : NULL;
dummy_ot.invoke = (have_function[3]) ? rna_operator_invoke_cb : NULL;
dummy_ot.modal = (have_function[4]) ? rna_operator_modal_cb : NULL;