[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40693] trunk/blender/source/blender/ blenkernel/intern: Commented and tagged some unused vars, added some var init (gcc warnings...).

Bastien Montagne montagne29 at wanadoo.fr
Thu Sep 29 17:28:22 CEST 2011


Revision: 40693
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40693
Author:   mont29
Date:     2011-09-29 15:28:22 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Commented and tagged some unused vars, added some var init (gcc warnings...).
Won?\226?\128?\153t go further, most other warnings are from GE or intern/extern lib code...

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/implicit.c
    trunk/blender/source/blender/blenkernel/intern/multires.c
    trunk/blender/source/blender/blenkernel/intern/softbody.c

Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c	2011-09-29 14:41:11 UTC (rev 40692)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c	2011-09-29 15:28:22 UTC (rev 40693)
@@ -913,7 +913,7 @@
 {
 	// Solves for unknown X in equation AX=B
 	unsigned int conjgrad_loopcount=0, conjgrad_looplimit=100;
-	float conjgrad_epsilon=0.0001f, conjgrad_lasterror=0;
+	float conjgrad_epsilon=0.0001f /* , conjgrad_lasterror=0 */ /* UNUSED */;
 	lfVector *q, *d, *tmp, *r; 
 	float s, starget, a, s_prev;
 	unsigned int numverts = lA[0].vcount;
@@ -964,7 +964,7 @@
 
 		conjgrad_loopcount++;
 	}
-	conjgrad_lasterror = s;
+	/* conjgrad_lasterror = s; */ /* UNUSED */
 
 	del_lfvector(q);
 	del_lfvector(d);
@@ -1777,7 +1777,7 @@
 	steps = 55;
 	for (i=0; i<steps; i++) {
 		for (node=cloth->springs; node; node=node->next) {
-			ClothVertex *cv1, *cv2;
+			/* ClothVertex *cv1, *cv2; */ /* UNUSED */
 			int v1, v2;
 			float len, c, l, vec[3];
 			
@@ -1786,8 +1786,8 @@
 				continue;
 			
 			v1 = spring->ij; v2 = spring->kl;
-			cv1 = cloth->verts + v1;
-			cv2 = cloth->verts + v2;
+			/* cv1 = cloth->verts + v1; */ /* UNUSED */
+			/* cv2 = cloth->verts + v2; */ /* UNUSED */
 			len = len_v3v3(cos[v1], cos[v2]);
 			
 			sub_v3_v3v3(vec, cos[v1], cos[v2]);

Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c	2011-09-29 14:41:11 UTC (rev 40692)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c	2011-09-29 15:28:22 UTC (rev 40693)
@@ -1029,7 +1029,7 @@
 	int nvert = (mface->v4)? 4: 3;
 	int newtotdisp = multires_grid_tot[newlvl]*nvert;
 	int x, y, S;
-	float (*disps)[3], (*out)[3], u, v;
+	float (*disps)[3], (*out)[3], u = 0.0f, v = 0.0f; /* Quite gcc barking. */
 
 	disps = MEM_callocN(sizeof(float) * 3 * newtotdisp, "multires disps");
 

Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c	2011-09-29 14:41:11 UTC (rev 40692)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c	2011-09-29 15:28:22 UTC (rev 40693)
@@ -1744,12 +1744,12 @@
 	GHash *hash;
 	GHashIterator *ihash;
 	float nv1[3], nv2[3], nv3[3], nv4[3], edge1[3], edge2[3],d_nvect[3], dv1[3],ve[3],avel[3]={0.0,0.0,0.0},
-	vv1[3], vv2[3], vv3[3], vv4[3], coledge[3]={0.0f, 0.0f, 0.0f}, mindistedge = 1000.0f,
-	outerforceaccu[3],innerforceaccu[3],
-		facedist,n_mag,force_mag_norm,minx,miny,minz,maxx,maxy,maxz,
-		innerfacethickness = -0.5f, outerfacethickness = 0.2f,
-		ee = 5.0f, ff = 0.1f, fa=1;
-	int a, deflected=0, cavel=0,ci=0;
+	      vv1[3], vv2[3], vv3[3], vv4[3], coledge[3]={0.0f, 0.0f, 0.0f}, mindistedge = 1000.0f,
+	      outerforceaccu[3], innerforceaccu[3],
+	      facedist, /* n_mag, */ /* UNUSED */ force_mag_norm, minx, miny, minz, maxx, maxy, maxz,
+	      innerfacethickness = -0.5f, outerfacethickness = 0.2f,
+	      ee = 5.0f, ff = 0.1f, fa=1;
+	int a, deflected=0, cavel=0, ci=0;
 /* init */
 	*intrusion = 0.0f;
 	hash  = vertexowner->soft->scratch->colliderhash;
@@ -1869,7 +1869,7 @@
 					VECSUB(dv1,opco,nv2); /* abuse dv1 to have vertex in question at *origin* of triangle */
 
 					cross_v3_v3v3(d_nvect, edge2, edge1);
-					n_mag = normalize_v3(d_nvect);
+					/* n_mag = */ /* UNUSED */ normalize_v3(d_nvect);
 					facedist = dot_v3v3(dv1,d_nvect);
 					// so rules are
 					//
@@ -1906,7 +1906,7 @@
 						VECSUB(dv1,opco,nv4); /* abuse dv1 to have vertex in question at *origin* of triangle */
 
 						cross_v3_v3v3(d_nvect, edge2, edge1);
-						n_mag = normalize_v3(d_nvect);
+						/* n_mag = */ /* UNUSED */ normalize_v3(d_nvect);
 						facedist = dot_v3v3(dv1,d_nvect);
 
 						if ((facedist > innerfacethickness) && (facedist < outerfacethickness)){




More information about the Bf-blender-cvs mailing list