From 2f6a158d21ae0ca5dba0c67e4e199cd995e4ce15 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 23 Jan 2010 01:02:53 +0000 Subject: when python calls an operator, return a set from the operator flag, this matches the set that python operators themselves return. eg. {'MODAL'} or... {'FINISHED'} --- source/blender/python/intern/bpy_operator.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/blender/python/intern/bpy_operator.c') diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index d5f4b2f6d08..bd7a0a97115 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -32,6 +32,8 @@ #include "bpy_rna.h" /* for setting arg props only - pyrna_py_to_prop() */ #include "bpy_util.h" +#include "RNA_enum_types.h" + #include "WM_api.h" #include "WM_types.h" @@ -45,6 +47,7 @@ static PyObject *pyop_call( PyObject * self, PyObject * args) wmOperatorType *ot; int error_val = 0; PointerRNA ptr; + int operator_ret= OPERATOR_CANCELLED; char *opname; PyObject *kw= NULL; /* optional args */ @@ -94,7 +97,7 @@ static PyObject *pyop_call( PyObject * self, PyObject * args) reports= MEM_mallocN(sizeof(ReportList), "wmOperatorReportList"); BKE_reports_init(reports, RPT_STORE); - WM_operator_call_py(C, ot, context, &ptr, reports); + operator_ret= WM_operator_call_py(C, ot, context, &ptr, reports); if(BPy_reports_to_error(reports)) error_val = -1; @@ -140,7 +143,9 @@ static PyObject *pyop_call( PyObject * self, PyObject * args) return NULL; } - Py_RETURN_NONE; + /* return operator_ret as a bpy enum */ + return pyrna_enum_bitfield_to_py(operator_return_items, operator_ret); + } static PyObject *pyop_as_string( PyObject * self, PyObject * args) -- cgit v1.2.3