several bug fixes

1 files changed, 58 insertions, 131 deletions

diff --git a/source/blender/python/api2_2x/Metaball.h b/source/blender/python/api2_2x/Metaball.h
index c79406862bd..2da63447225 100644
--- a/source/blender/python/api2_2x/Metaball.h
+++ b/source/blender/python/api2_2x/Metaball.h
@@ -27,7 +27,7 @@
  * Contributor(s): Jacques Guignot
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
-*/
+ */
 
 #ifndef EXPP_METABALL_H
 #define EXPP_METABALL_H
@@ -103,41 +103,20 @@ static PyObject *Metaball_setRendersize(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getThresh(C_Metaball *self);
 static PyObject *Metaball_setThresh(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getNMetaElems(C_Metaball *self);
-static PyObject *Metaball_getNMetaElems1(C_Metaball *self);
 static PyObject *Metaball_getMetatype(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_setMetatype(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getMetadata(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_setMetadata(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetalay(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetalay(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetaflag(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetaflag(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetaselcol(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetaselcol(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetapad(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetapad(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getMetax(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_setMetax(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getMetay(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_setMetay(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getMetaz(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_setMetaz(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetaexpx(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetaexpx(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetaexpy(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetaexpy(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetaexpz(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetaexpz(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetarad(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetarad(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetarad2(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetarad2(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getMetas(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_setMetas(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getMetalen(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_setMetalen(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_getMetamaxrad2(C_Metaball *self,PyObject*args);
-static PyObject *Metaball_setMetamaxrad2(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getloc(C_Metaball *self);
 static PyObject *Metaball_setloc(C_Metaball *self,PyObject*args);
 static PyObject *Metaball_getrot(C_Metaball *self);
@@ -149,121 +128,69 @@ static PyObject *Metaball_setsize(C_Metaball *self,PyObject*args);
 /* Python C_Metaball methods table:                                            */
 /*****************************************************************************/
 static PyMethodDef C_Metaball_methods[] = {
- /* name, method, flags, doc */
+	/* name, method, flags, doc */
   {"getName", (PyCFunction)Metaball_getName,\
-   METH_NOARGS, "() - Return Metaball Data name"},
-
+   METH_NOARGS, "() - Return Metaball  name"},
   {"setName", (PyCFunction)Metaball_setName,\
- METH_VARARGS, "() - Sets Metaball Data name"},
-
+	 METH_VARARGS, "() - Sets Metaball  name"},
   {"getWiresize", (PyCFunction)Metaball_getWiresize,\
-   METH_NOARGS, "() - Return Metaball Data wiresize"},
-
+   METH_NOARGS, "() - Return Metaball  wire size"},
   {"setWiresize", (PyCFunction)Metaball_setWiresize,\
- METH_VARARGS, "() - Sets Metaball Data wiresize"},
-
+	 METH_VARARGS, "() - Sets Metaball  wire size"},
   {"getRendersize", (PyCFunction)Metaball_getRendersize,\
-   METH_NOARGS, "() - Return Metaball Data rendersize"},
-
+   METH_NOARGS, "() - Return Metaball  render size"},
   {"setRendersize", (PyCFunction)Metaball_setRendersize,\
- METH_VARARGS, "() - Sets Metaball Data rendersize"},
-
+	 METH_VARARGS, "() - Sets Metaball  render size"},
   {"getThresh", (PyCFunction)Metaball_getThresh,\
-   METH_NOARGS, "() - Return Metaball Data thresh"},
-
+   METH_NOARGS, "() - Return Metaball  threshold"},
   {"setThresh", (PyCFunction)Metaball_setThresh,\
- METH_VARARGS, "() - Sets Metaball Data thresh"},  
-
-{"getBbox", (PyCFunction)Metaball_getBbox,\
+	 METH_VARARGS, "() - Sets Metaball  threshold"}, 
+	{"getBbox", (PyCFunction)Metaball_getBbox,\
    METH_NOARGS, "() - Return Metaball bounding box"},
-
   {"getNMetaElems",(PyCFunction)Metaball_getNMetaElems,\
-METH_NOARGS, "() - "},
-
-  {"getNMetaElems1",(PyCFunction)Metaball_getNMetaElems1,\
-METH_NOARGS, "() - "},
+	 METH_NOARGS, "() Returns the number of Spheres "},
   {"getMetatype", (PyCFunction)Metaball_getMetatype , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - "},
   {"setMetatype", (PyCFunction)Metaball_setMetatype , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - "},
   {"getMetadata", (PyCFunction)Metaball_getMetadata , \
-METH_VARARGS, "() - Gets Metaball MetaData "},
+	 METH_VARARGS, "() - Gets Metaball MetaData "},
   {"setMetadata", (PyCFunction)Metaball_setMetadata , \
-METH_VARARGS, "() - "},
-  {"getMetalay", (PyCFunction)Metaball_getMetalay , \
-METH_VARARGS, "() - "},
-  {"setMetalay", (PyCFunction)Metaball_setMetalay , \
-METH_VARARGS, "() - "},
-  {"getMetaflag", (PyCFunction)Metaball_getMetaflag , \
-METH_VARARGS, "() - "},
-  {"setMetaflag", (PyCFunction)Metaball_setMetaflag , \
-METH_VARARGS, "() - "},
-  {"getMetaselcol", (PyCFunction)Metaball_getMetaselcol , \
-METH_VARARGS, "() - "},
-  {"setMetaselcol", (PyCFunction)Metaball_setMetaselcol , \
-METH_VARARGS, "() - "},
-  {"getMetapad", (PyCFunction)Metaball_getMetapad , \
-METH_VARARGS, "() - "},
-  {"setMetapad", (PyCFunction)Metaball_setMetapad , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - "},
   {"getMetax", (PyCFunction)Metaball_getMetax , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - gets the x coordinate of the metaelement "},
   {"setMetax", (PyCFunction)Metaball_setMetax , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() -sets the x coordinate of the metaelement "},
   {"getMetay", (PyCFunction)Metaball_getMetay , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - gets the y coordinate of the metaelement"},
   {"setMetay", (PyCFunction)Metaball_setMetay , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - sets the y coordinate of the metaelement"},
   {"getMetaz", (PyCFunction)Metaball_getMetaz , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - gets the z coordinate of the metaelement"},
   {"setMetaz", (PyCFunction)Metaball_setMetaz , \
-METH_VARARGS, "() - "},
-  {"getMetaexpx", (PyCFunction)Metaball_getMetaexpx , \
-METH_VARARGS, "() - "},
-  {"setMetaexpx", (PyCFunction)Metaball_setMetaexpx , \
-METH_VARARGS, "() - "},
-  {"getMetaexpy", (PyCFunction)Metaball_getMetaexpy , \
-METH_VARARGS, "() - "},
-  {"setMetaexpy", (PyCFunction)Metaball_setMetaexpy , \
-METH_VARARGS, "() - "},
-  {"getMetaexpz", (PyCFunction)Metaball_getMetaexpz , \
-METH_VARARGS, "() - "},
-  {"setMetaexpz", (PyCFunction)Metaball_setMetaexpz , \
-METH_VARARGS, "() - "},
-  {"getMetarad", (PyCFunction)Metaball_getMetarad , \
-METH_VARARGS, "() - "},
-  {"setMetarad", (PyCFunction)Metaball_setMetarad , \
-METH_VARARGS, "() - "},
-  {"getMetarad2", (PyCFunction)Metaball_getMetarad2 , \
-METH_VARARGS, "() - "},
-  {"setMetarad2", (PyCFunction)Metaball_setMetarad2 , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - sets the z coordinate of the metaelement"}, 
   {"getMetas", (PyCFunction)Metaball_getMetas , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - gets the s coordinate of the metaelement"},
   {"setMetas", (PyCFunction)Metaball_setMetas , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() - sets the s coordinate of the metaelement"},
   {"getMetalen", (PyCFunction)Metaball_getMetalen , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() -  gets the length of the metaelement."},
   {"setMetalen", (PyCFunction)Metaball_setMetalen , \
-METH_VARARGS, "() - "},
-  {"getMetamaxrad2", (PyCFunction)Metaball_getMetamaxrad2 , \
-METH_VARARGS, "() - "},
-  {"setMetamaxrad2", (PyCFunction)Metaball_setMetamaxrad2 , \
-METH_VARARGS, "() - "},
+	 METH_VARARGS, "() -  sets the length of the metaelement."},
   {"getloc", (PyCFunction)Metaball_getloc , \
-METH_NOARGS, "() - Gets Metaball loc values"},
+	 METH_NOARGS, "() - Gets Metaball loc values"},
   {"setloc", (PyCFunction)Metaball_setloc , \
-METH_VARARGS, "(f f f) - Sets Metaball loc values"},
+	 METH_VARARGS, "(f f f) - Sets Metaball loc values"},
   {"getrot", (PyCFunction)Metaball_getrot , \
-METH_NOARGS, "() - Gets Metaball rot values"},
+	 METH_NOARGS, "() - Gets Metaball rot values"},
   {"setrot", (PyCFunction)Metaball_setrot , \
-METH_VARARGS, "(f f f) - Sets Metaball rot values"},
+	 METH_VARARGS, "(f f f) - Sets Metaball rot values"},
   {"getsize", (PyCFunction)Metaball_getsize , \
-METH_NOARGS, "() - Gets Metaball size values"},
+	 METH_NOARGS, "() - Gets Metaball size values"},
   {"setsize", (PyCFunction)Metaball_setsize , \
-METH_VARARGS, "(f f f) - Sets Metaball size values"},
-/*end of MetaElem data*/
- {0}
+	 METH_VARARGS, "(f f f) - Sets Metaball size values"},
+	/*end of MetaElem data*/
+	{0}
 };
 
 /*****************************************************************************/
@@ -278,29 +205,29 @@ static PyObject *MetaballRepr (C_Metaball *self);
 /*****************************************************************************/
 /* Python Metaball_Type structure definition:                                  */
 /*****************************************************************************/
-PyTypeObject Metaball_Type =
-{
-  PyObject_HEAD_INIT(NULL)
-  0,                                      /* ob_size */
-  "Metaball",                               /* tp_name */
-  sizeof (C_Metaball),                      /* tp_basicsize */
-  0,                                      /* tp_itemsize */
-  /* methods */
-  (destructor)MetaballDeAlloc,              /* tp_dealloc */
-  (printfunc)MetaballPrint,                 /* tp_print */
-  (getattrfunc)MetaballGetAttr,             /* tp_getattr */
-  (setattrfunc)MetaballSetAttr,             /* tp_setattr */
-  0,                                      /* tp_compare */
-  (reprfunc)MetaballRepr,                   /* tp_repr */
-  0,                                      /* tp_as_number */
-  0,                                      /* tp_as_sequence */
-  0,                                      /* tp_as_mapping */
-  0,                                      /* tp_as_hash */
-  0,0,0,0,0,0,
-  0,                                      /* tp_doc */ 
-  0,0,0,0,0,0,
-  C_Metaball_methods,                       /* tp_methods */
-  0,                                      /* tp_members */
-};
+static PyTypeObject Metaball_Type =
+	{
+		PyObject_HEAD_INIT(NULL)
+		0,                                      /* ob_size */
+		"Metaball",                               /* tp_name */
+		sizeof (C_Metaball),                      /* tp_basicsize */
+		0,                                      /* tp_itemsize */
+		/* methods */
+		(destructor)MetaballDeAlloc,              /* tp_dealloc */
+		(printfunc)MetaballPrint,                 /* tp_print */
+		(getattrfunc)MetaballGetAttr,             /* tp_getattr */
+		(setattrfunc)MetaballSetAttr,             /* tp_setattr */
+		0,                                      /* tp_compare */
+		(reprfunc)MetaballRepr,                   /* tp_repr */
+		0,                                      /* tp_as_number */
+		0,                                      /* tp_as_sequence */
+		0,                                      /* tp_as_mapping */
+		0,                                      /* tp_as_hash */
+		0,0,0,0,0,0,
+		0,                                      /* tp_doc */ 
+		0,0,0,0,0,0,
+		C_Metaball_methods,                       /* tp_methods */
+		0,                                      /* tp_members */
+	};
 
 #endif /* EXPP_METABALL_H */