sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

better exception check for calling operators. non dict/None values were being treated as None.

Browse Source
This commit is contained in:
Campbell Barton 2010-11-07 04:46:50 +00:00
parent 46f90690e0
commit c34275bcab
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/python/intern/bpy_operator.c
View File

@ -73,8 +73,13 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
}
}
if(!PyDict_Check(context_dict))
if(context_dict==NULL || context_dict==Py_None) {
context_dict= NULL;
}
else if (!PyDict_Check(context_dict)) {
PyErr_Format(PyExc_TypeError, "Calling operator \"bpy.ops.%s.poll\" error, custom context expected a dict or None, got a %.200s", opname, Py_TYPE(context_dict)->tp_name);
return NULL;
}
context_dict_back= CTX_py_dict_get(C);
@ -130,8 +135,13 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
}
}
if(!PyDict_Check(context_dict))
if(context_dict==NULL || context_dict==Py_None) {
context_dict= NULL;
}
else if (!PyDict_Check(context_dict)) {
PyErr_Format(PyExc_TypeError, "Calling operator \"bpy.ops.%s\" error, custom context expected a dict or None, got a %.200s", opname, Py_TYPE(context_dict)->tp_name);
return NULL;
}
context_dict_back= CTX_py_dict_get(C);