add cancel() method for python defined operators.

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 631af91a5bff40b0523bf57367b34dd2f1543b43..2a51d8b682bd326e942b8f5754f3d6d786fbba22 100644 (file)
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -828,6 +828,30 @@ static void operator_draw(bContext *C, wmOperator *op)
        RNA_parameter_list_free(&list);
 }
 
+/* same as exec(), but call cancel */
+static int operator_cancel(bContext *C, wmOperator *op)
+{
+       PointerRNA opr;
+       ParameterList list;
+       FunctionRNA *func;
+       void *ret;
+       int result;
+
+       RNA_pointer_create(&CTX_wm_screen(C)->id, op->type->ext.srna, op, &opr);
+       func= RNA_struct_find_function(&opr, "cancel");
+
+       RNA_parameter_list_create(&list, &opr, func);
+       RNA_parameter_set_lookup(&list, "context", &C);
+       op->type->ext.call(C, &opr, func, &list);
+
+       RNA_parameter_get_lookup(&list, "result", &ret);
+       result= *(int*)ret;
+
+       RNA_parameter_list_free(&list);
+
+       return result;
+}
+
 void operator_wrapper(wmOperatorType *ot, void *userdata);
 void macro_wrapper(wmOperatorType *ot, void *userdata);
 
@@ -839,7 +863,7 @@ static StructRNA *rna_Operator_register(bContext *C, ReportList *reports, void *
        wmOperatorType dummyot = {NULL};
        wmOperator dummyop= {NULL};
        PointerRNA dummyotr;
-       int have_function[6];
+       int have_function[7];
 
        /* setup dummy operator & operator type to store static properties in */
        dummyop.type= &dummyot;
@@ -927,6 +951,7 @@ static StructRNA *rna_Operator_register(bContext *C, ReportList *reports, void *
        dummyot.invoke=         (have_function[3])? operator_invoke: NULL;
        dummyot.modal=          (have_function[4])? operator_modal: NULL;
        dummyot.ui=                     (have_function[5])? operator_draw: NULL;
+       dummyot.cancel=         (have_function[6])? operator_cancel: NULL;
        WM_operatortype_append_ptr(operator_wrapper, (void *)&dummyot);
 
        /* update while blender is running */

diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index aad00a468d54cd8e802fbdeb0c973bfc9bdce021..4891d8b107850a54722d19437805afacbd35a451 100644 (file)
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -215,6 +215,13 @@ void RNA_api_operator(StructRNA *srna)
        RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL);
        parm= RNA_def_pointer(func, "context", "Context", "", "");
        RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
+
+       /* cancel */
+       func= RNA_def_function(srna, "cancel", NULL);
+       RNA_def_function_ui_description(func, "Called when the operator is cancelled.");
+       RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL);
+       parm= RNA_def_pointer(func, "context", "Context", "", "");
+       RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
 }
 
 void RNA_api_macro(StructRNA *srna)