[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10782] trunk/blender/source/blender/ python/api2_2x: More memory leaks fixed - in IDProp, Bone.head, tail, matrix, ob.DupObjects (my fault) and in Effect module as well as a few others.
Campbell Barton
cbarton at metavr.com
Sat May 26 06:39:32 CEST 2007
Revision: 10782
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bforge-svn&revision=10782
Author: campbellbarton
Date: 2007-05-26 06:39:31 +0200 (Sat, 26 May 2007)
Log Message:
-----------
More memory leaks fixed - in IDProp, Bone.head, tail, matrix, ob.DupObjects (my fault) and in Effect module as well as a few others.
Also stopped using Py_BuildValue for strings, ints and floats.
Modified Paths:
--------------
trunk/blender/source/blender/python/api2_2x/Blender.c
trunk/blender/source/blender/python/api2_2x/Bone.c
trunk/blender/source/blender/python/api2_2x/Effect.c
trunk/blender/source/blender/python/api2_2x/Font.c
trunk/blender/source/blender/python/api2_2x/IDProp.c
trunk/blender/source/blender/python/api2_2x/Image.c
trunk/blender/source/blender/python/api2_2x/Ipo.c
trunk/blender/source/blender/python/api2_2x/Key.c
trunk/blender/source/blender/python/api2_2x/Lamp.c
trunk/blender/source/blender/python/api2_2x/Library.c
trunk/blender/source/blender/python/api2_2x/Material.c
trunk/blender/source/blender/python/api2_2x/Mathutils.c
trunk/blender/source/blender/python/api2_2x/Noise.c
trunk/blender/source/blender/python/api2_2x/Object.c
trunk/blender/source/blender/python/api2_2x/Scene.c
trunk/blender/source/blender/python/api2_2x/Text.c
trunk/blender/source/blender/python/api2_2x/charRGBA.c
trunk/blender/source/blender/python/api2_2x/point.c
trunk/blender/source/blender/python/api2_2x/rgbTuple.c
Modified: trunk/blender/source/blender/python/api2_2x/Blender.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Blender.c 2007-05-25 20:54:48 UTC (rev 10781)
+++ trunk/blender/source/blender/python/api2_2x/Blender.c 2007-05-26 04:39:31 UTC (rev 10782)
@@ -528,7 +528,7 @@
"expected int argument (or nothing)" );
}
- return M_Window_Redraw( self, Py_BuildValue( "(i)", wintype ) );
+ return M_Window_Redraw( self, PyInt_FromLong( (long)wintype ) );
}
/*****************************************************************************/
Modified: trunk/blender/source/blender/python/api2_2x/Bone.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Bone.c 2007-05-25 20:54:48 UTC (rev 10781)
+++ trunk/blender/source/blender/python/api2_2x/Bone.c 2007-05-26 04:39:31 UTC (rev 10782)
@@ -935,10 +935,10 @@
}
//------------------------Bone.roll (get)
static PyObject *Bone_getRoll(BPy_Bone *self, void *closure)
-{
- return Py_BuildValue("{s:O, s:O}",
- "BONESPACE", PyFloat_FromDouble((self->bone->roll * (180/Py_PI))),
- "ARMATURESPACE", PyFloat_FromDouble((boneRoll_ToArmatureSpace(self->bone) * (180/Py_PI))));
+{
+ return Py_BuildValue("{s:f, s:f}",
+ "BONESPACE", self->bone->roll * (180/Py_PI),
+ "ARMATURESPACE", boneRoll_ToArmatureSpace(self->bone) * (180/Py_PI));
}
//------------------------Bone.roll (set)
static int Bone_setRoll(BPy_Bone *self, PyObject *value, void *closure)
@@ -949,9 +949,14 @@
//------------------------Bone.head (get)
static PyObject *Bone_getHead(BPy_Bone *self, void *closure)
{
- return Py_BuildValue("{s:O, s:O}",
- "BONESPACE", newVectorObject(self->bone->head, 3, Py_WRAP),
- "ARMATURESPACE", newVectorObject(self->bone->arm_head, 3, Py_WRAP));
+ PyObject *val1 = newVectorObject(self->bone->head, 3, Py_WRAP);
+ PyObject *val2 = newVectorObject(self->bone->arm_head, 3, Py_WRAP);
+ PyObject *ret = Py_BuildValue(
+ "{s:O, s:O}", "BONESPACE", val1, "ARMATURESPACE", val2);
+
+ Py_DECREF(val1);
+ Py_DECREF(val2);
+ return ret;
}
//------------------------Bone.head (set)
static int Bone_setHead(BPy_Bone *self, PyObject *value, void *closure)
@@ -962,9 +967,14 @@
//------------------------Bone.tail (get)
static PyObject *Bone_getTail(BPy_Bone *self, void *closure)
{
- return Py_BuildValue("{s:O, s:O}",
- "BONESPACE", newVectorObject(self->bone->tail, 3, Py_WRAP),
- "ARMATURESPACE", newVectorObject(self->bone->arm_tail, 3, Py_WRAP));
+ PyObject *val1 = newVectorObject(self->bone->tail, 3, Py_WRAP);
+ PyObject *val2 = newVectorObject(self->bone->arm_tail, 3, Py_WRAP);
+ PyObject *ret = Py_BuildValue("{s:O, s:O}",
+ "BONESPACE", val1, "ARMATURESPACE", val2);
+
+ Py_DECREF(val1);
+ Py_DECREF(val2);
+ return ret;
}
//------------------------Bone.tail (set)
static int Bone_setTail(BPy_Bone *self, PyObject *value, void *closure)
@@ -1108,9 +1118,15 @@
//------------------------Bone.matrix (get)
static PyObject *Bone_getMatrix(BPy_Bone *self, void *closure)
{
- return Py_BuildValue("{s:O, s:O}",
- "BONESPACE", newMatrixObject((float*)self->bone->bone_mat, 3,3, Py_WRAP),
- "ARMATURESPACE", newMatrixObject((float*)self->bone->arm_mat, 4,4, Py_WRAP));
+ PyObject *val1 = newMatrixObject((float*)self->bone->bone_mat, 3,3, Py_WRAP);
+ PyObject *val2 = newMatrixObject((float*)self->bone->arm_mat, 4,4, Py_WRAP);
+ PyObject *ret = Py_BuildValue("{s:O, s:O}",
+ "BONESPACE", val1, "ARMATURESPACE", val2);
+ Py_DECREF(val1);
+ Py_DECREF(val2);
+ return ret;
+
+
}
//------------------------Bone.matrix (set)
static int Bone_setMatrix(BPy_Bone *self, PyObject *value, void *closure)
Modified: trunk/blender/source/blender/python/api2_2x/Effect.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Effect.c 2007-05-25 20:54:48 UTC (rev 10781)
+++ trunk/blender/source/blender/python/api2_2x/Effect.c 2007-05-26 04:39:31 UTC (rev 10782)
@@ -1494,7 +1494,7 @@
Effect *eff;
PartEff *paf;
Particle *pa=0;
- PyObject *list, *strand_list, *pyvec;
+ PyObject *list, *strand_list, *pyvec, *pyvec2;
float p_time, c_time, vec[3], vec1[3], cfra, m_time, s_time;
int a;
short disp=100 ;
@@ -1585,13 +1585,17 @@
}
where_is_particle(paf, pa, s_time, vec);
where_is_particle(paf, pa, p_time, vec1);
- if( PyList_Append( list, Py_BuildValue("[OO]",
- newVectorObject(vec, 3, Py_NEW),
- newVectorObject(vec1, 3, Py_NEW))) < 0 ) {
+ pyvec = newVectorObject(vec, 3, Py_NEW);
+ pyvec2 = newVectorObject(vec1, 3, Py_NEW);
+ if( PyList_Append( list, Py_BuildValue("[OO]", pyvec, pyvec2)) < 0 ) {
Py_DECREF( list );
+ Py_XDECREF( pyvec );
+ Py_XDECREF( pyvec2 );
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
"Couldn't append item to PyList" );
}
+ Py_DECREF( pyvec );
+ Py_DECREF( pyvec2 );
} else { /* not a vector */
where_is_particle(paf, pa, c_time, vec);
pyvec = newVectorObject(vec, 3, Py_NEW);
Modified: trunk/blender/source/blender/python/api2_2x/Font.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Font.c 2007-05-25 20:54:48 UTC (rev 10781)
+++ trunk/blender/source/blender/python/api2_2x/Font.c 2007-05-26 04:39:31 UTC (rev 10782)
@@ -166,7 +166,7 @@
/*create python font*/
if( !S_ISDIR(BLI_exist(filename_str)) ) {
tmp= Py_BuildValue("(s)", filename_str);
- py_font= (BPy_Font *) M_Text3d_LoadFont (self, Py_BuildValue("(s)", filename_str));
+ py_font= (BPy_Font *) M_Text3d_LoadFont (self, tmp);
Py_DECREF (tmp);
}
else
Modified: trunk/blender/source/blender/python/api2_2x/IDProp.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/IDProp.c 2007-05-25 20:54:48 UTC (rev 10781)
+++ trunk/blender/source/blender/python/api2_2x/IDProp.c 2007-05-26 04:39:31 UTC (rev 10782)
@@ -49,7 +49,7 @@
PyObject *IDGroup_repr( BPy_IDProperty *self )
{
- return Py_BuildValue( "s", "(ID Property)" );
+ return PyString_FromString( "(ID Property)" );
}
extern PyTypeObject IDGroup_Type;
@@ -58,11 +58,11 @@
{
switch ( prop->type ) {
case IDP_STRING:
- return Py_BuildValue( "s", prop->data.pointer );
+ return PyString_FromString( prop->data.pointer );
case IDP_INT:
- return Py_BuildValue( "i", prop->data.val );
+ return PyInt_FromLong( (long)prop->data.val );
case IDP_FLOAT:
- return Py_BuildValue( "f", *(float*)(&prop->data.val) );
+ return PyFloat_FromDouble( (double)(*(float*)(&prop->data.val)) );
case IDP_GROUP:
/*blegh*/
{
@@ -140,7 +140,7 @@
PyObject *BPy_IDGroup_GetName(BPy_IDProperty *self, void *bleh)
{
- return Py_BuildValue("s", self->prop->name);
+ return PyString_FromString(self->prop->name);
}
int BPy_IDGroup_SetName(BPy_IDProperty *self, PyObject *value, void *bleh)
@@ -159,7 +159,7 @@
PyObject *BPy_IDGroup_GetType(BPy_IDProperty *self)
{
- return Py_BuildValue("i", self->prop->type);
+ return PyInt_FromLong((long)self->prop->type);
}
static PyGetSetDef BPy_IDGroup_getseters[] = {
@@ -332,13 +332,13 @@
{
switch (prop->type) {
case IDP_STRING:
- return Py_BuildValue("s", prop->data.pointer);
+ return PyString_FromString(prop->data.pointer);
break;
case IDP_FLOAT:
- return Py_BuildValue("f", *((float*)&prop->data.val));
+ return PyFloat_FromDouble(*((float*)&prop->data.val));
break;
case IDP_INT:
- return Py_BuildValue("i", prop->data.val);
+ return PyInt_FromLong( (long)prop->data.val );
break;
case IDP_ARRAY:
{
@@ -351,8 +351,11 @@
for (i=0; i<prop->len; i++) {
if (prop->subtype == IDP_FLOAT)
- PyList_SetItem(seq, i, Py_BuildValue("f", ((float*)prop->data.pointer)[i]));
- else PyList_SetItem(seq, i, Py_BuildValue("i", ((int*)prop->data.pointer)[i]));
+ PyList_SetItem(seq, i,
+ PyFloat_FromDouble(((float*)prop->data.pointer)[i]));
+
+ else PyList_SetItem(seq, i,
+ PyInt_FromLong(((int*)prop->data.pointer)[i]));
}
return seq;
}
@@ -429,7 +432,7 @@
PyObject *BPy_IDGroup_GetKeys(BPy_IDProperty *self)
{
- PyObject *seq = PyList_New(self->prop->len), *st;
+ PyObject *seq = PyList_New(self->prop->len);
IDProperty *loop;
int i;
@@ -437,10 +440,8 @@
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
"PyList_New() failed" );
- for (i=0, loop=self->prop->data.group.first; loop; loop=loop->next, i++) {
- st = Py_BuildValue("s", loop->name);
- PyList_SetItem(seq, i, st);
- }
+ for (i=0, loop=self->prop->data.group.first; loop; loop=loop->next, i++)
+ PyList_SetItem(seq, i, PyString_FromString(loop->name));
return seq;
}
@@ -612,18 +613,18 @@
PyObject *IDArray_repr(BPy_IDArray *self)
{
- return Py_BuildValue("s", "(ID Array)");
+ return PyString_FromString("(ID Array)");
}
PyObject *BPy_IDArray_GetType(BPy_IDArray *self)
{
- return Py_BuildValue("i", self->prop->subtype);
+ return PyInt_FromLong( (long)self->prop->subtype );
}
PyObject *BPy_IDArray_GetLen(BPy_IDArray *self)
{
- return Py_BuildValue("i", self->prop->len);
+ return PyInt_FromLong( (long)self->prop->len );
}
static PyGetSetDef BPy_IDArray_getseters[] = {
@@ -651,10 +652,10 @@
switch (self->prop->subtype) {
case IDP_FLOAT:
- return Py_BuildValue("f", ((float*)self->prop->data.pointer)[index]);
+ return PyFloat_FromDouble( (double)(((float*)self->prop->data.pointer)[index]));
break;
case IDP_INT:
- return Py_BuildValue("i", ((int*)self->prop->data.pointer)[index]);
+ return PyInt_FromLong( (long)((int*)self->prop->data.pointer)[index] );
break;
}
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
@@ -803,20 +804,25 @@
PyObject *IDGroup_Iter_repr(BPy_IDGroup_Iter *self)
{
- return Py_BuildValue("s", "(ID Property Group)");
+ return PyString_FromString("(ID Property Group)");
}
PyObject *BPy_Group_Iter_Next(BPy_IDGroup_Iter *self)
{
IDProperty *cur=NULL;
+ PyObject *tmpval;
+ PyObject *ret;
if (self->cur) {
cur = self->cur;
self->cur = self->cur->next;
if (self->mode == IDPROP_ITER_ITEMS) {
- return Py_BuildValue("[s, O]", cur->name, BPy_IDGroup_WrapData(self->group->id, cur));
+ tmpval = BPy_IDGroup_WrapData(self->group->id, cur);
+ ret = Py_BuildValue("[s, O]", cur->name, tmpval);
+ Py_DECREF(tmpval);
+ return ret;
} else {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list