Revision: 19661
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19661
Author: campbellbarton
Date: 2009-04-11 17:05:42 +0200 (Sat, 11 Apr 2009)
Log Message:
-----------
Python Api
own error with refcounting and raise an error when bpy.types cant generate a
subtype (though it shouldn't happen)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/python/intern/bpy_panel_wrap.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
Modified:
branches/blender2.5/blender/source/blender/python/intern/bpy_panel_wrap.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_panel_wrap.c
2009-04-11 14:43:03 UTC (rev 19660)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_panel_wrap.c
2009-04-11 15:05:42 UTC (rev 19661)
@@ -79,7 +79,7 @@
ret = PyObject_Call(item, args, NULL);
- Py_DECREF(args);
+ /* args is decref'd from item */
Py_DECREF(item);
}
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-04-11 14:43:03 UTC (rev 19660)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-04-11 15:05:42 UTC (rev 19661)
@@ -1680,7 +1680,11 @@
else PyErr_Clear();
if (RNA_property_collection_lookup_string(&self->ptr, self->prop,
_PyUnicode_AsString(pyname), &newptr)) {
- return pyrna_struct_Subtype(&newptr);
+ ret= pyrna_struct_Subtype(&newptr);
+ if (ret==NULL) {
+ PyErr_Format(PyExc_SystemError, "bpy.types.%s subtype
could not be generated, this is a bug!", _PyUnicode_AsString(pyname));
+ }
+ return ret;
}
else { /* Override the error */
PyErr_Format(PyExc_AttributeError, "bpy.types.%s not a valid
RNA_Struct", _PyUnicode_AsString(pyname));
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
