code cleanup: remove/comment some unused code.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Apr 2012 05:09:37 +0000 (05:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Apr 2012 05:09:37 +0000 (05:09 +0000)
source/blender/blenfont/intern/blf_font.c
source/blender/bmesh/operators/bmo_mirror.c
source/blender/editors/mesh/editmesh_bvh.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/sound/sound_ops.c

index 84cefc923a0e8bd29019442bd43172982b149eac..7a4e1d4b78189021d02b09acc649d1f68b54d6ea 100644 (file)
@@ -279,8 +279,8 @@ void blf_font_buffer(FontBLF *font, const char *str)
 
                        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) {
index 1b6d64073c0069c500f4cb299fd429c22ff3eb63..17a00f5e095e089c0b5fb8430df5e3c3f901254f 100644 (file)
@@ -43,7 +43,7 @@ void bmo_mirror_exec(BMesh *bm, BMOperator *op)
        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 @@ void bmo_mirror_exec(BMesh *bm, BMOperator *op)
 
        /* 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;
index f9c673010f32c41cababd6ecf9f3841d87c4b6f8..c1b694d5e2d54cc5a3a01e7928c6dd8d0e210cd0 100644 (file)
@@ -305,19 +305,6 @@ BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, float *co, float maxdist)
        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)
index b8ab538b60e57c145cbfb2d4b8715fde7ed04bb4..2af931372bb23c0d537f3f593f2d3a07310d57ab 100644 (file)
@@ -2051,8 +2051,8 @@ void MESH_OT_remove_doubles(wmOperatorType *ot)
 /************************ Vertex Path Operator *************************/
 
 typedef struct PathNode {
-       int u;
-       int visited;
+       /* int u; */       /* UNUSED */
+       /* int visited; */ /* UNUSED */
        ListBase edges;
 } PathNode;
 
index f7598045f819c7323ba9d57a4ab97df0f2ac1a3a..b50c3f115346e82f5d40b139c6207be44e51109a 100644 (file)
@@ -283,8 +283,7 @@ static int sound_bake_animation_exec(bContext *C, wmOperator *UNUSED(op))
 
        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);
        }