[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45705] trunk/blender/source/blender: code cleanup: remove/comment some unused code.

[Campbell Barton]

Revision: 45705
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45705
Author:   campbellbarton
Date:     2012-04-17 05:09:37 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
code cleanup: remove/comment some unused code.

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf_font.c
    trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
    trunk/blender/source/blender/editors/mesh/editmesh_bvh.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/sound/sound_ops.c

Modified: trunk/blender/source/blender/blenfont/intern/blf_font.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_font.c	2012-04-16 18:24:49 UTC (rev 45704)
+++ trunk/blender/source/blender/blenfont/intern/blf_font.c	2012-04-17 05:09:37 UTC (rev 45705)
@@ -279,8 +279,8 @@
 
 			if (font->b_fbuf) {
 				int yb = yb_start;
-				for (y = (chy >= 0 ? 0:-chy); y < height_clip; y++) {
-					for (x = (chx >= 0 ? 0:-chx); x < width_clip; x++) {
+				for (y = ((chy >= 0) ? 0 : -chy); y < height_clip; y++) {
+					for (x = ((chx >= 0) ? 0 : -chx); x < width_clip; x++) {
 						a = *(g->bitmap + x + (yb * g->pitch)) / 255.0f;
 
 						if (a > 0.0f) {

Modified: trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_mirror.c	2012-04-16 18:24:49 UTC (rev 45704)
+++ trunk/blender/source/blender/bmesh/operators/bmo_mirror.c	2012-04-17 05:09:37 UTC (rev 45705)
@@ -43,7 +43,7 @@
 	BMOperator dupeop, weldop;
 	BMOIter siter;
 	BMIter iter;
-	BMVert *v, *v2, **vmap = NULL;
+	BMVert *v /* , *v2 */ /* UNUSED */, **vmap = NULL;
 	BLI_array_declare(vmap);
 	BMEdge /*  *e, */ **emap = NULL;
 	BLI_array_declare(emap);
@@ -69,11 +69,11 @@
 
 	/* create old -> new mappin */
 	i = 0;
-	v2 = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
+	/* v2 = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); */ /* UNUSED */
 	BMO_ITER(v, &siter, bm, &dupeop, "newout", BM_VERT) {
 		BLI_array_growone(vmap);
 		vmap[i] = v;
-		v2 = BM_iter_step(&iter);
+		/* v2 = BM_iter_step(&iter); */ /* UNUSED */
 		i++;
 	}
 	bm->elem_index_dirty |= BM_VERT;

Modified: trunk/blender/source/blender/editors/mesh/editmesh_bvh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_bvh.c	2012-04-16 18:24:49 UTC (rev 45704)
+++ trunk/blender/source/blender/editors/mesh/editmesh_bvh.c	2012-04-17 05:09:37 UTC (rev 45705)
@@ -305,19 +305,6 @@
 	return NULL;
 }
 
-typedef struct walklist {
-	BMVert *v;
-	int valence;
-	int depth;
-	float w, r;
-	int totwalked;
-
-	/* state data */
-	BMVert *lastv;
-	BMLoop *curl, *firstl;
-	BMEdge *cure;
-} walklist;
-
 /* UNUSED */
 #if 0
 static short winding(float *v1, float *v2, float *v3)

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-16 18:24:49 UTC (rev 45704)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-17 05:09:37 UTC (rev 45705)
@@ -2051,8 +2051,8 @@
 /************************ Vertex Path Operator *************************/
 
 typedef struct PathNode {
-	int u;
-	int visited;
+	/* int u; */       /* UNUSED */
+	/* int visited; */ /* UNUSED */
 	ListBase edges;
 } PathNode;
 

Modified: trunk/blender/source/blender/editors/sound/sound_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sound/sound_ops.c	2012-04-16 18:24:49 UTC (rev 45704)
+++ trunk/blender/source/blender/editors/sound/sound_ops.c	2012-04-17 05:09:37 UTC (rev 45705)
@@ -283,8 +283,7 @@
 
 	sound_update_animation_flags_exec(C, NULL);
 
-	for (cfra = scene->r.sfra > 0 ? scene->r.sfra - 1 : 0; cfra <= scene->r.efra + 1; cfra++)
-	{
+	for (cfra = (scene->r.sfra > 0) ? (scene->r.sfra - 1) : 0; cfra <= scene->r.efra + 1; cfra++) {
 		scene->r.cfra = cfra;
 		scene_update_for_newframe(bmain, scene, scene->lay);
 	}