[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43921] branches/bmesh/blender/source/ blender/editors/mesh/editbmesh_add.c: grid size was being ignored for grid and plane primitives

[Campbell Barton]

Revision: 43921
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43921
Author:   campbellbarton
Date:     2012-02-05 22:27:44 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
grid size was being ignored for grid and plane primitives

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c

Modified: branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c	2012-02-05 22:19:27 UTC (rev 43920)
+++ branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c	2012-02-05 22:27:44 UTC (rev 43921)
@@ -169,7 +169,7 @@
 	Object *obedit;
 	Mesh *me;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3], mat[4][4], dia = 1.0f;
 	int enter_editmode;
 	int state;
 	unsigned int layer;
@@ -182,10 +182,9 @@
 	em = me->edit_btmesh;
 
 	if (!EDBM_CallAndSelectOpf(em, op, "vertout", 
-			"create_grid xsegments=%i ysegments=%i size=%f mat=%m4", 1, 1, 1.0f, mat))
+			"create_grid xsegments=%i ysegments=%i size=%f mat=%m4", 1, 1, dia, mat))
 		return OPERATOR_CANCELLED;
-	
-	/* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41 makes it unit size) */
+
 	make_prim_finish(C, &state, enter_editmode);
 
 	return OPERATOR_FINISHED;	
@@ -439,7 +438,7 @@
 	Object *obedit;
 	Mesh *me;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia;
+	float loc[3], rot[3], mat[4][4], dia = 1.0f;
 	int enter_editmode;
 	int state;
 	unsigned int layer;
@@ -455,7 +454,7 @@
 			"create_grid xsegments=%i ysegments=%i size=%f mat=%m4",
 			RNA_int_get(op->ptr, "x_subdivisions"), 
 			RNA_int_get(op->ptr, "y_subdivisions"), 
-			RNA_float_get(op->ptr, "size"), mat))
+			RNA_float_get(op->ptr, "size") * dia, mat))
 	{
 		return OPERATOR_CANCELLED;
 	}