[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45249] trunk/blender/source/blender/ editors/mesh/editmesh_add.c: fix invalid *= on an un-initialized value when adding primitives.

Campbell Barton ideasman42 at gmail.com
Thu Mar 29 00:11:20 CEST 2012


Revision: 45249
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45249
Author:   campbellbarton
Date:     2012-03-28 22:11:19 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
fix invalid *= on an un-initialized value when adding primitives.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_add.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c	2012-03-28 22:03:46 UTC (rev 45248)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c	2012-03-28 22:11:19 UTC (rev 45249)
@@ -101,7 +101,7 @@
 		*state = 1;
 	}
 
-	*dia *= new_primitive_matrix(C, loc, rot, mat);
+	*dia = new_primitive_matrix(C, loc, rot, mat);
 }
 
 static void make_prim_finish(bContext *C, int *state, int enter_editmode)
@@ -127,7 +127,7 @@
 	Object *obedit;
 	Mesh *me;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia = 1.0f;
+	float loc[3], rot[3], mat[4][4], dia;
 	int enter_editmode;
 	int state;
 	unsigned int layer;
@@ -185,7 +185,7 @@
 	me = obedit->data;
 	em = me->edit_btmesh;
 
-	if (!EDBM_op_call_and_selectf(em, op, "vertout", "create_cube mat=%m4 size=%f", mat, 2.0f)) {
+	if (!EDBM_op_call_and_selectf(em, op, "vertout", "create_cube mat=%m4 size=%f", mat, dia * 2.0f)) {
 		return OPERATOR_CANCELLED;
 	}
 	
@@ -412,7 +412,7 @@
 	Object *obedit;
 	Mesh *me;
 	BMEditMesh *em;
-	float loc[3], rot[3], mat[4][4], dia = 1.0f;
+	float loc[3], rot[3], mat[4][4], dia;
 	int enter_editmode;
 	int state;
 	unsigned int layer;




More information about the Bf-blender-cvs mailing list