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

Bugfix: Object.link() was not correctly handling object/datablock material

Browse Source 
counting, causing "Error Totblock" messages on exit due to memory not being
freed.  Added a call to test_object_materials() after the new data is linked.
This commit is contained in:
Ken Hughes
2006-03-11 01:17:21 +00:00
parent 93c3a6f784
commit 04ce5e8efe
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/python/api2_2x/Object.c
View File

@@ -1700,12 +1700,7 @@ static PyObject *Object_link( BPy_Object * self, PyObject * args )
}
self->object->data = data;
if( self->object->type == OB_MESH ) {
self->object->totcol = 0;
EXPP_synchronizeMaterialLists( self->object );
}
//creates the curve for the text object
/* creates the curve for the text object */
if (self->object->type == OB_FONT)
text_to_curve(self->object, 0);
@@ -1714,10 +1709,14 @@ static PyObject *Object_link( BPy_Object * self, PyObject * args )
if( oldid->us > 0 ) {
oldid->us--;
} else {
return ( EXPP_ReturnPyObjError( PyExc_RuntimeError,
"old object reference count below 0" ) );
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
"old object reference count below 0" );
}
}
/* make sure data and object materials are consistent */
test_object_materials( id );
return EXPP_incr_ret( Py_None );
}