[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11232] branches/pyapi_devel/source/ blender/python/api2_2x: made the tp_getset names consistant _getset rather then getseters or getsets

Campbell Barton cbarton at metavr.com
Wed Jul 11 21:55:21 CEST 2007


Revision: 11232
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11232
Author:   campbellbarton
Date:     2007-07-11 21:55:21 +0200 (Wed, 11 Jul 2007)

Log Message:
-----------
made the tp_getset names consistant _getset rather then getseters or getsets

Modified Paths:
--------------
    branches/pyapi_devel/source/blender/python/api2_2x/Armature.c
    branches/pyapi_devel/source/blender/python/api2_2x/BezTriple.c
    branches/pyapi_devel/source/blender/python/api2_2x/Bone.c
    branches/pyapi_devel/source/blender/python/api2_2x/Camera.c
    branches/pyapi_devel/source/blender/python/api2_2x/Constraint.c
    branches/pyapi_devel/source/blender/python/api2_2x/CurNurb.c
    branches/pyapi_devel/source/blender/python/api2_2x/Curve.c
    branches/pyapi_devel/source/blender/python/api2_2x/Effect.c
    branches/pyapi_devel/source/blender/python/api2_2x/Font.c
    branches/pyapi_devel/source/blender/python/api2_2x/Group.c
    branches/pyapi_devel/source/blender/python/api2_2x/IDProp.c
    branches/pyapi_devel/source/blender/python/api2_2x/Image.c
    branches/pyapi_devel/source/blender/python/api2_2x/Ipo.c
    branches/pyapi_devel/source/blender/python/api2_2x/Ipocurve.c
    branches/pyapi_devel/source/blender/python/api2_2x/Key.c
    branches/pyapi_devel/source/blender/python/api2_2x/Lamp.c
    branches/pyapi_devel/source/blender/python/api2_2x/Lattice.c
    branches/pyapi_devel/source/blender/python/api2_2x/Library.c
    branches/pyapi_devel/source/blender/python/api2_2x/MTex.c
    branches/pyapi_devel/source/blender/python/api2_2x/Material.c
    branches/pyapi_devel/source/blender/python/api2_2x/Material.h
    branches/pyapi_devel/source/blender/python/api2_2x/Mathutils.c
    branches/pyapi_devel/source/blender/python/api2_2x/Mesh.c
    branches/pyapi_devel/source/blender/python/api2_2x/Metaball.c
    branches/pyapi_devel/source/blender/python/api2_2x/Modifier.c
    branches/pyapi_devel/source/blender/python/api2_2x/NLA.c
    branches/pyapi_devel/source/blender/python/api2_2x/Node.c
    branches/pyapi_devel/source/blender/python/api2_2x/Object.c
    branches/pyapi_devel/source/blender/python/api2_2x/Pose.c
    branches/pyapi_devel/source/blender/python/api2_2x/Scene.c
    branches/pyapi_devel/source/blender/python/api2_2x/Sound.c
    branches/pyapi_devel/source/blender/python/api2_2x/SurfNurb.c
    branches/pyapi_devel/source/blender/python/api2_2x/Text.c
    branches/pyapi_devel/source/blender/python/api2_2x/Text3d.c
    branches/pyapi_devel/source/blender/python/api2_2x/Texture.c
    branches/pyapi_devel/source/blender/python/api2_2x/World.c
    branches/pyapi_devel/source/blender/python/api2_2x/bpy_config.c
    branches/pyapi_devel/source/blender/python/api2_2x/bpy_data.c
    branches/pyapi_devel/source/blender/python/api2_2x/bpy_float.c
    branches/pyapi_devel/source/blender/python/api2_2x/bpy_list.c
    branches/pyapi_devel/source/blender/python/api2_2x/charRGBA.c
    branches/pyapi_devel/source/blender/python/api2_2x/color.c
    branches/pyapi_devel/source/blender/python/api2_2x/euler.c
    branches/pyapi_devel/source/blender/python/api2_2x/layer_set.c
    branches/pyapi_devel/source/blender/python/api2_2x/matrix.c
    branches/pyapi_devel/source/blender/python/api2_2x/quat.c
    branches/pyapi_devel/source/blender/python/api2_2x/sceneRender.c
    branches/pyapi_devel/source/blender/python/api2_2x/sceneSequence.c
    branches/pyapi_devel/source/blender/python/api2_2x/vector.c

Modified: branches/pyapi_devel/source/blender/python/api2_2x/Armature.c
===================================================================
--- branches/pyapi_devel/source/blender/python/api2_2x/Armature.c	2007-07-11 18:45:39 UTC (rev 11231)
+++ branches/pyapi_devel/source/blender/python/api2_2x/Armature.c	2007-07-11 19:55:21 UTC (rev 11232)
@@ -982,7 +982,7 @@
 		"Adds temporal IK chains while grabbing bones", NULL},
 	{"layers", (getter)Armature_getLayers, (setter)Armature_setLayers, 
 		"List of layers for the armature", NULL},
-	{NULL, NULL, NULL, NULL, NULL}
+	{NULL}
 };
 //------------------------tp_new
 //This methods creates a new object (note it does not initialize it - only the building)

Modified: branches/pyapi_devel/source/blender/python/api2_2x/BezTriple.c
===================================================================
--- branches/pyapi_devel/source/blender/python/api2_2x/BezTriple.c	2007-07-11 18:45:39 UTC (rev 11231)
+++ branches/pyapi_devel/source/blender/python/api2_2x/BezTriple.c	2007-07-11 19:55:21 UTC (rev 11232)
@@ -442,7 +442,7 @@
  * Python BezTriple attributes get/set structure
  */
 
-static PyGetSetDef BPy_BezTriple_getseters[] = {
+static PyGetSetDef BPy_BezTriple_getset[] = {
 	{"pt",
 	 (getter)BezTriple_getPoints, (setter)BezTriple_setPoints,
 	 "point knot values",
@@ -475,7 +475,7 @@
 	 (getter)BezTriple_getRadius, (setter)BezTriple_setRadius,
 	 "point radius",
 	 NULL},
-	{NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
+	{NULL}  /* Sentinel */
 };
 
 /*****************************************************************************/
@@ -560,7 +560,7 @@
   /*** Attribute descriptor and subclassing stuff ***/
 	BPy_BezTriple_methods,      /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	BPy_BezTriple_getseters,    /* struct PyGetSetDef *tp_getset; */
+	BPy_BezTriple_getset,    /* struct PyGetSetDef *tp_getset; */
 	NULL,                       /* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */

Modified: branches/pyapi_devel/source/blender/python/api2_2x/Bone.c
===================================================================
--- branches/pyapi_devel/source/blender/python/api2_2x/Bone.c	2007-07-11 18:45:39 UTC (rev 11231)
+++ branches/pyapi_devel/source/blender/python/api2_2x/Bone.c	2007-07-11 19:55:21 UTC (rev 11232)
@@ -749,7 +749,7 @@
 		"Set the radius of this bones tip", NULL},
 	{"headRadius", (getter)EditBone_getHeadRadius, (setter)EditBone_setHeadRadius, 
 		"Set the radius of this bones head", NULL},
-	{NULL, NULL, NULL, NULL,NULL}
+	{NULL}
 };
 
 //------------------------tp_repr
@@ -820,17 +820,17 @@
 }
 //------------------TYPE_OBECT DEFINITION--------------------------
 PyTypeObject EditBone_Type = {
-	PyObject_HEAD_INIT(NULL)       //tp_head
+	PyObject_HEAD_INIT(NULL)			       //tp_head
 	0,											//tp_internal
-	"EditBone",								//tp_name
-	sizeof(BPy_EditBone),				//tp_basicsize
+	"EditBone",									//tp_name
+	sizeof(BPy_EditBone),						//tp_basicsize
 	0,											//tp_itemsize
-	(destructor)EditBone_dealloc,		//tp_dealloc
+	(destructor)EditBone_dealloc,				//tp_dealloc
 	0,											//tp_print
 	0,											//tp_getattr
 	0,											//tp_setattr
 	0,											//tp_compare
-	(reprfunc)EditBone_repr,			//tp_repr
+	(reprfunc)EditBone_repr,					//tp_repr
 	0,											//tp_as_number
 	0,											//tp_as_sequence
 	0,											//tp_as_mapping
@@ -840,17 +840,17 @@
 	0,											//tp_getattro
 	0,											//tp_setattro
 	0,											//tp_as_buffer
-	Py_TPFLAGS_DEFAULT,				//tp_flags
-	BPy_EditBone_doc,					//tp_doc
+	Py_TPFLAGS_DEFAULT,							//tp_flags
+	BPy_EditBone_doc,							//tp_doc
 	0,											//tp_traverse
 	0,											//tp_clear
 	0,											//tp_richcompare
 	0,											//tp_weaklistoffset
 	0,											//tp_iter
 	0,											//tp_iternext
-	BPy_EditBone_methods,				//tp_methods
+	BPy_EditBone_methods,						//tp_methods
 	0,											//tp_members
-	BPy_EditBone_getset,				//tp_getset
+	BPy_EditBone_getset,						//tp_getset
 	0,											//tp_base
 	0,											//tp_dict
 	0,											//tp_descr_get
@@ -858,7 +858,7 @@
 	0,											//tp_dictoffset
 	0, 											//tp_init
 	0,											//tp_alloc
-	(newfunc)EditBone_new,			//tp_new
+	(newfunc)EditBone_new,						//tp_new
 	0,											//tp_free
 	0,											//tp_is_gc
 	0,											//tp_bases
@@ -1238,7 +1238,7 @@
 		"Set the radius of this bones tip", NULL},
 	{"headRadius", (getter)Bone_getHeadRadius, (setter)Bone_setHeadRadius, 
 		"Set the radius of this bones head", NULL},
-	{NULL, NULL, NULL, NULL,NULL}
+	{NULL}
 };
 //------------------------tp_repr
 //This is the string representation of the object
@@ -1260,17 +1260,17 @@
 
 //------------------TYPE_OBECT DEFINITION--------------------------
 PyTypeObject Bone_Type = {
-	PyObject_HEAD_INIT(NULL)   //tp_head
+	PyObject_HEAD_INIT(NULL)				//tp_head
 	0,										//tp_internal
-	"Bone",								//tp_name
-	sizeof(BPy_Bone),					//tp_basicsize
+	"Bone",									//tp_name
+	sizeof(BPy_Bone),						//tp_basicsize
 	0,										//tp_itemsize
-	(destructor)Bone_dealloc,		//tp_dealloc
+	(destructor)Bone_dealloc,				//tp_dealloc
 	0,										//tp_print
 	0,										//tp_getattr
 	0,										//tp_setattr
 	0,										//tp_compare
-	(reprfunc) Bone_repr,			//tp_repr
+	(reprfunc) Bone_repr,					//tp_repr
 	0,										//tp_as_number
 	0,										//tp_as_sequence
 	0,										//tp_as_mapping
@@ -1280,17 +1280,17 @@
 	0,										//tp_getattro
 	0,										//tp_setattro
 	0,										//tp_as_buffer
-	Py_TPFLAGS_DEFAULT,         //tp_flags
-	BPy_Bone_doc,					//tp_doc
+	Py_TPFLAGS_DEFAULT,      				//tp_flags
+	BPy_Bone_doc,							//tp_doc
 	0,										//tp_traverse
 	0,										//tp_clear
 	0,										//tp_richcompare
 	0,										//tp_weaklistoffset
 	0,										//tp_iter
 	0,										//tp_iternext
-	BPy_Bone_methods,				//tp_methods
+	BPy_Bone_methods,						//tp_methods
 	0,										//tp_members
-	BPy_Bone_getset,				//tp_getset
+	BPy_Bone_getset,						//tp_getset
 	0,										//tp_base
 	0,										//tp_dict
 	0,										//tp_descr_get

Modified: branches/pyapi_devel/source/blender/python/api2_2x/Camera.c
===================================================================
--- branches/pyapi_devel/source/blender/python/api2_2x/Camera.c	2007-07-11 18:45:39 UTC (rev 11231)
+++ branches/pyapi_devel/source/blender/python/api2_2x/Camera.c	2007-07-11 19:55:21 UTC (rev 11232)
@@ -397,7 +397,7 @@
 /*****************************************************************************/
 /* Python attributes get/set structure:                                      */
 /*****************************************************************************/
-static PyGetSetDef BPy_Camera_getseters[] = {
+static PyGetSetDef BPy_Camera_getset[] = {
 	GENERIC_LIB_GETSETATTR,
 	GENERIC_LIB_GETSETATTR_SCRIPTLINK,
 	{"orthographic",
@@ -499,7 +499,7 @@
 @type angleToggle: bool",
 	 (void *)CAM_ANGLETOGGLE},
 #endif
-	{NULL,NULL,NULL,NULL}  /* Sentinel */
+	{NULL}  /* Sentinel */
 };
 
 
@@ -566,7 +566,7 @@
   /*** Attribute descriptor and subclassing stuff ***/
 	BPy_Camera_methods,       /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	BPy_Camera_getseters,                       /* struct PyGetSetDef *tp_getset; */
+	BPy_Camera_getset,                       /* struct PyGetSetDef *tp_getset; */
 	NULL,                       /* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */

Modified: branches/pyapi_devel/source/blender/python/api2_2x/Constraint.c
===================================================================
--- branches/pyapi_devel/source/blender/python/api2_2x/Constraint.c	2007-07-11 18:45:39 UTC (rev 11231)
+++ branches/pyapi_devel/source/blender/python/api2_2x/Constraint.c	2007-07-11 19:55:21 UTC (rev 11232)
@@ -188,7 +188,7 @@
 /*****************************************************************************/
 /* Python BPy_Constraint attributes get/set structure:                       */
 /*****************************************************************************/
-static PyGetSetDef BPy_Constraint_getseters[] = {
+static PyGetSetDef BPy_Constraint_getset[] = {
 	{"name",
 	(getter)Constraint_getName, (setter)Constraint_setName,
 	 "Constraint name", NULL},
@@ -198,7 +198,7 @@
 	{"influence",
 	(getter)Constraint_getInfluence, (setter)Constraint_setInfluence,
 	 "Constraint influence", NULL},
-	{NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
+	{NULL}  /* Sentinel */
 };
 
 /*****************************************************************************/
@@ -279,7 +279,7 @@
   /*** Attribute descriptor and subclassing stuff ***/
 	BPy_Constraint_methods,       /* struct PyMethodDef *tp_methods; */
 	NULL,                       /* struct PyMemberDef *tp_members; */
-	BPy_Constraint_getseters,     /* struct PyGetSetDef *tp_getset; */
+	BPy_Constraint_getset,     /* struct PyGetSetDef *tp_getset; */
 	NULL,                       /* struct _typeobject *tp_base; */
 	NULL,                       /* PyObject *tp_dict; */
 	NULL,                       /* descrgetfunc tp_descr_get; */

Modified: branches/pyapi_devel/source/blender/python/api2_2x/CurNurb.c
===================================================================
--- branches/pyapi_devel/source/blender/python/api2_2x/CurNurb.c	2007-07-11 18:45:39 UTC (rev 11231)
+++ branches/pyapi_devel/source/blender/python/api2_2x/CurNurb.c	2007-07-11 19:55:21 UTC (rev 11232)
@@ -156,7 +156,7 @@
 	0
 };
 
-static PyGetSetDef BPy_CurNurb_getseters[] = {
+static PyGetSetDef BPy_CurNurb_getset[] = {
 	{"mat_index",
 	 (getter)CurNurb_getMatIndex, (setter)CurNurb_setMatIndex,
 	 "CurNurb's material index",
@@ -186,7 +186,7 @@
 	 "The The knot vector in the V direction",
 	 NULL},
 
-	{NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
+	{NULL}  /* Sentinel */
 };
 
 /*
@@ -256,7 +256,7 @@
   /*** Attribute descriptor and subclassing stuff ***/
 	BPy_CurNurb_methods,	/*    struct PyMethodDef *tp_methods; */
 	0,			/*    struct PyMemberDef *tp_members; */
-	BPy_CurNurb_getseters,			/*    struct PyGetSetDef *tp_getset; */
+	BPy_CurNurb_getset,			/*    struct PyGetSetDef *tp_getset; */
 	0,			/*    struct _typeobject *tp_base; */
 	0,			/*    PyObject *tp_dict; */

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list