code cleanup: warnings
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Feb 2013 16:20:39 +0000 (16:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Feb 2013 16:20:39 +0000 (16:20 +0000)
intern/cycles/blender/blender_curves.cpp
source/blender/blenkernel/intern/customdata.c
source/blender/bmesh/tools/bmesh_bevel.c

index 05661d4..8fb4813 100644 (file)
@@ -828,7 +828,7 @@ void ExportCurveTriangleVcol(Mesh *mesh, ParticleCurveData *CData, int interpola
                return;
 
        float time = 0.0f;
-       float prevtime = 0.0f;
+//     float prevtime = 0.0f; // UNUSED
 
        int vertexindex = vert_offset;
 
@@ -865,7 +865,7 @@ void ExportCurveTriangleVcol(Mesh *mesh, ParticleCurveData *CData, int interpola
                                                }
                                        }
 
-                                       prevtime = time;
+                                       // prevtime = time;  // UNUSED
                                }
                        }
                }
index f3548f7..580a694 100644 (file)
@@ -1242,12 +1242,15 @@ void CustomData_update_typemap(CustomData *data)
        }
 }
 
+/* currently only used in BLI_assert */
+#ifndef NDEBUG
 static int customdata_typemap_is_valid(const CustomData *data)
 {
        CustomData data_copy = *data;
        CustomData_update_typemap(&data_copy);
        return (memcmp(data->typemap, data_copy.typemap, sizeof(data->typemap)) == 0);
 }
+#endif
 
 void CustomData_merge(const struct CustomData *source, struct CustomData *dest,
                       CustomDataMask mask, int alloctype, int totelem)
index e60ce56..1e74354 100644 (file)
@@ -384,6 +384,7 @@ static void offset_in_two_planes(EdgeHalf *e1, EdgeHalf *e2, EdgeHalf *emid,
        int iret;
 
        BLI_assert(f1 != NULL && f2 != NULL);
+       (void)f1, (void)f2;  /* UNUSED */
 
        /* get direction vectors for two offset lines */
        sub_v3_v3v3(dir1, v->co, BM_edge_other_vert(e1->e, v)->co);