[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11033] branches/2-44-stable/blender/ source/blender/python/api2_2x/meshPrimitive.c: Merge from trunk.

[Ken Hughes]

Revision: 11033
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11033
Author:   khughes
Date:     2007-06-23 23:12:14 +0200 (Sat, 23 Jun 2007)

Log Message:
-----------
Merge from trunk.

Bugfix #6682: some Mesh.Primitive default values didn't match UI values.
Revision: 10734
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10734
Author:   khughes

Modified Paths:
--------------
    branches/2-44-stable/blender/source/blender/python/api2_2x/meshPrimitive.c

Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/meshPrimitive.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/meshPrimitive.c	2007-06-23 15:02:49 UTC (rev 11032)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/meshPrimitive.c	2007-06-23 21:12:14 UTC (rev 11033)
@@ -114,20 +114,22 @@
 
 static PyObject *M_MeshPrim_Cube( PyObject *self_unused, PyObject *args )
 {
-	float size = 2.0;
+	float height = 2.0;
+	float dia;
 
-	if( !PyArg_ParseTuple( args, "|f", &size ) )
+	if( !PyArg_ParseTuple( args, "|f", &height ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 				"expected optional float arg" );
 
-	size *= (float)(sqrt(2.0)/2.0);
-	return make_mesh( 1, "Cube", 4, 0, 0, size, -size, 1, 1 );
+	height /= 2.0;
+	dia = height * (float)sqrt(2.0);
+	return make_mesh( 1, "Cube", 4, 32, 2, dia, -height, 1, 1 );
 }
 
 static PyObject *M_MeshPrim_Circle( PyObject *self_unused, PyObject *args )
 {
 	int tot = 32;
-	float size = (float)(2.0*sqrt(2.0));
+	float size = 2;
 
 	if( !PyArg_ParseTuple( args, "|if", &tot, &size ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
@@ -143,8 +145,8 @@
 static PyObject *M_MeshPrim_Cylinder( PyObject *self_unused, PyObject *args )
 {
 	int tot = 32;
-	float size = (float)(2.0*sqrt(2.0));
-	float len = 1.0;
+	float size = 2.0;
+	float len = 2.0;
 
 	if( !PyArg_ParseTuple( args, "|iff", &tot, &size, &len ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
@@ -153,15 +155,14 @@
 		return EXPP_ReturnPyObjError( PyExc_ValueError,
 				"number of vertices must be in the range [3:100]" );
 
-	size /= 2.0;
-	return make_mesh( 5, "Cylinder", tot, 0, 0, size, -len, 1, 1 );
+	return make_mesh( 5, "Cylinder", tot, 0, 0, size/2.0, -len/2.0, 1, 1 );
 }
 
 static PyObject *M_MeshPrim_Tube( PyObject *self_unused, PyObject *args )
 {
 	int tot = 32;
-	float size = (float)(2.0*sqrt(2.0));
-	float len = 1.0;
+	float size = 2.0;
+	float len = 2.0;
 
 	if( !PyArg_ParseTuple( args, "|iff", &tot, &size, &len ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
@@ -170,15 +171,14 @@
 		return EXPP_ReturnPyObjError( PyExc_ValueError,
 				"number of vertices must be in the range [3:100]" );
 
-	size /= 2.0;
-	return make_mesh( 6, "Tube", tot, 0, 0, size, -len, 1, 0 );
+	return make_mesh( 6, "Tube", tot, 0, 0, size/2.0, -len/2.0, 1, 0 );
 }
 
 static PyObject *M_MeshPrim_Cone( PyObject *self_unused, PyObject *args )
 {
 	int tot = 32;
-	float size = (float)(2.0*sqrt(2.0));
-	float len = 1.0;
+	float size = 2.0;
+	float len = 2.0;
 
 	if( !PyArg_ParseTuple( args, "|iff", &tot, &size, &len ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
@@ -187,8 +187,7 @@
 		return EXPP_ReturnPyObjError( PyExc_ValueError,
 				"number of vertices must be in the range [3:100]" );
 
-	size /= 2.0;
-	return make_mesh( 7, "Cone", tot, 0, 0, size, -len, 0, 1 );
+	return make_mesh( 7, "Cone", tot, 0, 0, size/2.0, -len/2.0, 0, 1 );
 }
 
 static PyObject *M_MeshPrim_Grid( PyObject *self_unused, PyObject *args )
@@ -212,7 +211,7 @@
 {
 	int segs = 32;
 	int rings = 32;
-	float size = (float)(2.0*sqrt(2.0));
+	float size = 2.0;
 
 	if( !PyArg_ParseTuple( args, "|iif", &segs, &rings, &size ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
@@ -228,7 +227,7 @@
 static PyObject *M_MeshPrim_Icosphere( PyObject *self_unused, PyObject *args )
 {
 	int subdiv = 2;
-	float size = (float)(2.0*sqrt(2.0));
+	float size = 2.0;
 
 	if( !PyArg_ParseTuple( args, "|if", &subdiv, &size ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,