[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12912] trunk/blender/source/blender/ python/api2_5x: Python API
Ken Hughes
khughes at pacific.edu
Mon Dec 17 01:54:23 CET 2007
Revision: 12912
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12912
Author: khughes
Date: 2007-12-17 01:54:22 +0100 (Mon, 17 Dec 2007)
Log Message:
-----------
Python API
----------
Removed references to PyObject_Del and PyFloat_Type from static structure
definitions. mingw (and possibly other compilers) don't like this and won't
compile. These reference have to be filled in at runtime inside the
structure initialization.
There was some discussion on IRC whether the explicit PyObject_Del assignment
is necessary, since PyTYpe_Ready() is supposed to fill in this field if left
blank. Since we weren't sure why this was being done, it was decided to
put the run-time assignment in for now.
Modified Paths:
--------------
trunk/blender/source/blender/python/api2_5x/Camera.c
trunk/blender/source/blender/python/api2_5x/Const.c
trunk/blender/source/blender/python/api2_5x/Constraint.c
trunk/blender/source/blender/python/api2_5x/CurNurb.c
trunk/blender/source/blender/python/api2_5x/Effect.c
trunk/blender/source/blender/python/api2_5x/Font.c
trunk/blender/source/blender/python/api2_5x/Geometry.c
trunk/blender/source/blender/python/api2_5x/Group.c
trunk/blender/source/blender/python/api2_5x/IDProp.c
trunk/blender/source/blender/python/api2_5x/Ipo.c
trunk/blender/source/blender/python/api2_5x/Key.c
trunk/blender/source/blender/python/api2_5x/Lamp.c
trunk/blender/source/blender/python/api2_5x/Library.c
trunk/blender/source/blender/python/api2_5x/MTex.c
trunk/blender/source/blender/python/api2_5x/Material.c
trunk/blender/source/blender/python/api2_5x/Metaball.c
trunk/blender/source/blender/python/api2_5x/Modifier.c
trunk/blender/source/blender/python/api2_5x/NLA.c
trunk/blender/source/blender/python/api2_5x/Particle.c
trunk/blender/source/blender/python/api2_5x/Pose.c
trunk/blender/source/blender/python/api2_5x/SurfNurb.c
trunk/blender/source/blender/python/api2_5x/Texture.c
trunk/blender/source/blender/python/api2_5x/bpy_config.c
trunk/blender/source/blender/python/api2_5x/bpy_data.c
trunk/blender/source/blender/python/api2_5x/bpy_float.c
trunk/blender/source/blender/python/api2_5x/bpy_state.c
trunk/blender/source/blender/python/api2_5x/bpy_utils.c
trunk/blender/source/blender/python/api2_5x/charRGBA.c
trunk/blender/source/blender/python/api2_5x/windowTheme.c
Modified: trunk/blender/source/blender/python/api2_5x/Camera.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/Camera.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/Camera.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -517,7 +517,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -592,5 +592,6 @@
PyObject * CameraType_Init( void )
{
PyType_Ready( &BPyCamera_Type );
+ BPyCamera_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &BPyCamera_Type;
}
Modified: trunk/blender/source/blender/python/api2_5x/Const.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/Const.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/Const.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -346,7 +346,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -435,7 +435,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -608,6 +608,7 @@
{
/* perform type initialization if it hasn't been done already */
PyType_Ready( &Const_Type );
+ Const_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &Const_Type;
}
@@ -615,5 +616,6 @@
{
/* perform type initialization if it hasn't been done already */
PyType_Ready( &ConstCategory_Type );
+ ConstCategory_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &ConstCategory_Type;
}
Modified: trunk/blender/source/blender/python/api2_5x/Constraint.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/Constraint.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/Constraint.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -257,7 +257,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -2138,7 +2138,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -2607,6 +2607,7 @@
BPyConstraint_Type.tp_dict = PyDict_New();
PyConstCategory_AddObjectToDict( BPyConstraint_Type.tp_dict, &constraintTypes );
PyType_Ready( &BPyConstraint_Type ) ;
+ BPyConstraint_Type.tp_dealloc = (destructor)&PyObject_Del;
}
return (PyObject *) &BPyConstraint_Type ;
}
@@ -2614,6 +2615,7 @@
PyObject *ConstraintSeqType_Init( void )
{
PyType_Ready( &ConstraintSeq_Type );
+ ConstraintSeq_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &ConstraintSeq_Type;
}
Modified: trunk/blender/source/blender/python/api2_5x/CurNurb.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/CurNurb.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/CurNurb.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -192,7 +192,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -1033,6 +1033,7 @@
PyObject *CurNurbType_Init( void )
{
PyType_Ready( &BPyCurNurb_Type );
+ BPyCurNurb_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &BPyCurNurb_Type;
}
Modified: trunk/blender/source/blender/python/api2_5x/Effect.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/Effect.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/Effect.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -393,7 +393,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -1184,6 +1184,7 @@
BPyEffect_Type.tp_dict = PyDict_New();
PyConstCategory_AddObjectToDict( BPyEffect_Type.tp_dict, &speedTypes );
PyType_Ready( &BPyEffect_Type ) ;
+ BPyEffect_Type.tp_dealloc = (destructor)&PyObject_Del;
}
return (PyObject *) &BPyEffect_Type ;
}
Modified: trunk/blender/source/blender/python/api2_5x/Font.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/Font.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/Font.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -185,7 +185,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -273,5 +273,6 @@
PyObject *FontType_Init( void )
{
PyType_Ready( &BPyFont_Type ) ;
+ BPyFont_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &BPyFont_Type ;
}
Modified: trunk/blender/source/blender/python/api2_5x/Geometry.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/Geometry.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/Geometry.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -360,7 +360,7 @@
BPyVectorObject *pt, *line_1, *line_2;
float pt_in[3], pt_out[3], l1[3], l2[3];
float lambda;
- PyObject *ret, *val1, *val2;
+ PyObject *ret;
if( !PyArg_ParseTuple ( args, "O!O!O!",
&BPyVector_Type, &pt,
Modified: trunk/blender/source/blender/python/api2_5x/Group.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/Group.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/Group.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -377,7 +377,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -699,6 +699,7 @@
PyObject * GroupType_Init( void )
{
PyType_Ready( &BPyGroup_Type );
+ BPyGroup_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &BPyGroup_Type;
}
Modified: trunk/blender/source/blender/python/api2_5x/IDProp.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/IDProp.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/IDProp.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -537,7 +537,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -719,7 +719,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -837,7 +837,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ NULL, /* tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -889,16 +889,19 @@
PyObject *IDGroupType_Init( void )
{
PyType_Ready( &BPyIDGroup_Type );
+ BPyIDGroup_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &BPyIDGroup_Type;
}
PyObject *IDGroupIterType_Init( void )
{
PyType_Ready( &BPyIDGroupIter_Type );
+ BPyIDGroupIter_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &BPyIDGroupIter_Type;
}
PyObject *IDArrayType_Init( void )
{
PyType_Ready( &BPyIDArray_Type );
+ BPyIDArray_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &BPyIDArray_Type;
}
Modified: trunk/blender/source/blender/python/api2_5x/Ipo.c
===================================================================
--- trunk/blender/source/blender/python/api2_5x/Ipo.c 2007-12-16 19:10:29 UTC (rev 12911)
+++ trunk/blender/source/blender/python/api2_5x/Ipo.c 2007-12-17 00:54:22 UTC (rev 12912)
@@ -356,7 +356,7 @@
/* Methods to implement standard operations */
- (destructor)PyObject_Del, /* tp_dealloc */
+ (destructor)NULL, /* tp_dealloc */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
@@ -1482,5 +1482,6 @@
PyObject * IpoType_Init( void )
{
PyType_Ready( &BPyIpo_Type );
+ BPyIpo_Type.tp_dealloc = (destructor)&PyObject_Del;
return (PyObject *) &BPyIpo_Type;
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list