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

rna_define.c, RNA_def_struct - set the py_type to NULL when making an rna struct based on another.

Browse Source 
bpy_util.c, PyObSpit - print refcount with PyObject
This commit is contained in:
Campbell Barton
2009-05-28 02:03:48 +00:00
parent 4512be4b6c
commit a804ae7b3f
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/python/intern/bpy_rna.c
View File

@@ -1366,15 +1366,11 @@ static void pyrna_subtype_set_rna(PyObject *newclass, StructRNA *srna)
PyObject *item;
Py_INCREF(newclass);
/* Something fishy is going on here, the pointer is set many times but never free'd
* It also is almost always the same type so it looks like the same point is
* being reused when it should not be - must look into this further */
#if 0
if (RNA_struct_py_type_get(srna))
PyObSpit("RNA WAS SET - ", RNA_struct_py_type_get(srna));
Py_XDECREF(RNA_struct_py_type_get(srna)); // TODO - why does this crash???
#endif
PyObSpit("RNA WAS SET - ", RNA_struct_py_type_get(srna));
Py_XDECREF(RNA_struct_py_type_get(srna));
RNA_struct_py_type_set(srna, (void *)newclass); /* Store for later use */
@@ -1930,6 +1926,10 @@ static int bpy_class_call(PointerRNA *ptr, FunctionRNA *func, ParameterList *par
static void bpy_class_free(void *pyob_ptr)
{
if(G.f&G_DEBUG) {
if(((PyObject *)pyob_ptr)->ob_refcnt > 1)
PyObSpit("zombie class - ref should be 1", (PyObject *)pyob_ptr);
}
Py_DECREF((PyObject *)pyob_ptr);
}