[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13231] trunk/blender/source/blender: menu generation read and wrote to the same memory with sprintf(), use INIT_MINMAX in a few more places and centerview didnt take into account some bone tips in editmode .

[Campbell Barton]

Revision: 13231
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13231
Author:   campbellbarton
Date:     2008-01-14 11:41:36 +0100 (Mon, 14 Jan 2008)

Log Message:
-----------
menu generation read and wrote to the same memory with sprintf(), use INIT_MINMAX in a few more places and centerview didnt take into account some bone tips in editmode.

Modified Paths:
--------------
    trunk/blender/source/blender/radiosity/intern/source/radfactors.c
    trunk/blender/source/blender/src/buttons_editing.c
    trunk/blender/source/blender/src/edit.c
    trunk/blender/source/blender/src/view.c

Modified: trunk/blender/source/blender/radiosity/intern/source/radfactors.c
===================================================================
--- trunk/blender/source/blender/radiosity/intern/source/radfactors.c	2008-01-14 10:00:20 UTC (rev 13230)
+++ trunk/blender/source/blender/radiosity/intern/source/radfactors.c	2008-01-14 10:41:36 UTC (rev 13231)
@@ -744,11 +744,9 @@
 					}
 				}
 				if(rn) {
-					min[0]= min[1]= min[2]= 1.0e10;
-					max[0]= max[1]= max[2]= -1.0e10;
+					INIT_MINMAX(min, max);
 					/* errmin and max are the filtered colors */
-					errmin[0]= errmin[1]= errmin[2]= 1.0e10;
-					errmax[0]= errmax[1]= errmax[2]= -1.0e10;
+					INIT_MINMAX(errmin, errmax);
 					minmaxradelemfilt(rp->first, min, max, errmin, errmax);
 					
 					/* if small difference between colors: no subdiv */

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2008-01-14 10:00:20 UTC (rev 13230)
+++ trunk/blender/source/blender/src/buttons_editing.c	2008-01-14 10:41:36 UTC (rev 13231)
@@ -3920,9 +3920,10 @@
 	int		skip=0;
 	int		index, numbones, i;
 	char (*qsort_ptr)[32] = NULL;
+	char *s = string;
 
 	/* That space is there for a reason - for no parent */
-	sprintf (string, "Parent%%t| %%x%d", -1);	
+	s += sprintf (string, "Parent%%t| %%x%d", -1);	
 
 	numbones = BLI_countlist(&G.edbo);
 
@@ -3963,7 +3964,7 @@
 		   ( int (*)(const void *, const void *) ) strcmp);
 
 	for (i=0; i < numbones; ++i) {
-		sprintf (string, "%s%s", string, qsort_ptr[i]);
+		strcat(s, qsort_ptr[i]);
 	}
 
 	if (qsort_ptr)

Modified: trunk/blender/source/blender/src/edit.c
===================================================================
--- trunk/blender/source/blender/src/edit.c	2008-01-14 10:00:20 UTC (rev 13230)
+++ trunk/blender/source/blender/src/edit.c	2008-01-14 10:41:36 UTC (rev 13231)
@@ -952,7 +952,7 @@
 	/* I skip it for editmesh now (ton) */
 	if(G.obedit->type!=OB_MESH) {
 		countall();
-		if(mode) tottrans= G.totvert;
+ 		if(mode) tottrans= G.totvert;
 		else tottrans= G.totvertsel;
 
 		if(G.totvertsel==0) {
@@ -1915,7 +1915,7 @@
 
 	tottrans=0;
 	if ELEM5(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) 
-		make_trans_verts(bmat[0], bmat[1], 0);
+		make_trans_verts(bmat[0], bmat[1], 2);
 	if(tottrans==0) return 0;
 
 	Mat3CpyMat4(bmat, G.obedit->obmat);

Modified: trunk/blender/source/blender/src/view.c
===================================================================
--- trunk/blender/source/blender/src/view.c	2008-01-14 10:00:20 UTC (rev 13230)
+++ trunk/blender/source/blender/src/view.c	2008-01-14 10:41:36 UTC (rev 13231)
@@ -1300,8 +1300,7 @@
 
 	if(G.vd->localvd) return;
 
-	min[0]= min[1]= min[2]= 1.0e10;
-	max[0]= max[1]= max[2]= -1.0e10;
+	INIT_MINMAX(min, max);
 
 	locallay= free_localbit();
 
@@ -1396,9 +1395,7 @@
 	float new_ofs[3];
 	float new_dist;
 	
-	
-	min[0]= min[1]= min[2]= 1.0e10;
-	max[0]= max[1]= max[2]= -1.0e10;
+	INIT_MINMAX(min, max);
 
 	if (G.f & G_WEIGHTPAINT) {
 		/* hardcoded exception, we look for the one selected armature */
@@ -1577,8 +1574,7 @@
 		max[0]= max[1]= max[2]= 0.0;
 	}
 	else {
-		min[0]= min[1]= min[2]= 1.0e10;
-		max[0]= max[1]= max[2]= -1.0e10;
+		INIT_MINMAX(min, max);
 	}
 	
 	for(base= FIRSTBASE; base; base= base->next) {