diff options
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm_api.c | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm_gizmo.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 5f60ecf449b..8e68495dd78 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -469,12 +469,12 @@ const EnumPropertyItem rna_enum_operator_return_items[] = { "CANCELLED", 0, "Cancelled", - "When no action has been taken, operator exits"}, + "The operator exited without doing anything, so no undo entry should be pushed"}, {OPERATOR_FINISHED, "FINISHED", 0, "Finished", - "When the operator is complete, operator exits"}, + "The operator exited after completing its action"}, /* used as a flag */ {OPERATOR_PASS_THROUGH, "PASS_THROUGH", 0, "Pass Through", "Do nothing and pass the event on"}, {OPERATOR_INTERFACE, "INTERFACE", 0, "Interface", "Handled but not executed (popup menus)"}, diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index 1330250edab..841d82adcb7 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -639,7 +639,7 @@ static void rna_generic_op_invoke(FunctionRNA *func, int flag) if (flag & WM_GEN_INVOKE_RETURN) { parm = RNA_def_enum_flag( - func, "result", rna_enum_operator_return_items, OPERATOR_CANCELLED, "result", ""); + func, "result", rna_enum_operator_return_items, OPERATOR_FINISHED, "result", ""); RNA_def_function_return(func, parm); } } @@ -914,7 +914,7 @@ void RNA_api_operator(StructRNA *srna) /* better name? */ parm = RNA_def_enum_flag( - func, "result", rna_enum_operator_return_items, OPERATOR_CANCELLED, "result", ""); + func, "result", rna_enum_operator_return_items, OPERATOR_FINISHED, "result", ""); RNA_def_function_return(func, parm); /* check */ @@ -939,7 +939,7 @@ void RNA_api_operator(StructRNA *srna) /* better name? */ parm = RNA_def_enum_flag( - func, "result", rna_enum_operator_return_items, OPERATOR_CANCELLED, "result", ""); + func, "result", rna_enum_operator_return_items, OPERATOR_FINISHED, "result", ""); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "modal", NULL); /* same as invoke */ @@ -952,7 +952,7 @@ void RNA_api_operator(StructRNA *srna) /* better name? */ parm = RNA_def_enum_flag( - func, "result", rna_enum_operator_return_items, OPERATOR_CANCELLED, "result", ""); + func, "result", rna_enum_operator_return_items, OPERATOR_FINISHED, "result", ""); RNA_def_function_return(func, parm); /* draw */ diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index ba26929d808..0bd6769d3ad 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -1073,7 +1073,7 @@ static void rna_def_gizmo(BlenderRNA *brna, PropertyRNA *cprop) parm = RNA_def_enum_flag(func, "tweak", tweak_actions, 0, "Tweak", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); parm = RNA_def_enum_flag( - func, "result", rna_enum_operator_return_items, OPERATOR_CANCELLED, "result", ""); + func, "result", rna_enum_operator_return_items, OPERATOR_FINISHED, "result", ""); RNA_def_function_return(func, parm); /* wmGizmo.property_update */ /* TODO */ @@ -1092,7 +1092,7 @@ static void rna_def_gizmo(BlenderRNA *brna, PropertyRNA *cprop) parm = RNA_def_pointer(func, "event", "Event", "", ""); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); parm = RNA_def_enum_flag( - func, "result", rna_enum_operator_return_items, OPERATOR_CANCELLED, "result", ""); + func, "result", rna_enum_operator_return_items, OPERATOR_FINISHED, "result", ""); RNA_def_function_return(func, parm); /* wmGizmo.exit */ |