archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix [#36924] Calling .define(...) on Macro subclass crashes Blender, if subclass wasn't registered

Browse Source
This commit is contained in:
Campbell Barton
2013-10-03 05:27:39 +00:00
parent 5568b63087
commit 91e020eea9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/python/intern/bpy_operator_wrap.c
View File

@@ -177,14 +177,17 @@ PyObject *PYOP_wrap_macro_define(PyObject *UNUSED(self), PyObject *args)
}
/* identifiers */
srna = srna_from_self(macro, "Macro Define:");
macroname = RNA_struct_identifier(srna);
srna = pyrna_struct_as_srna((PyObject *)macro, false, "Macro Define:");
if (srna == NULL) {
return NULL;
}
macroname = RNA_struct_identifier(srna);
ot = WM_operatortype_find(macroname, true);
if (!ot) {
PyErr_Format(PyExc_ValueError,
"Macro Define: '%s' is not a valid macro or hasn't been registered yet",
"Macro Define: '%s' is not a valid macro",
macroname);
return NULL;
}