diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-02-04 20:20:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-04 20:20:39 +0400 |
commit | 9d713688bacfb9832cd7951eccaa05b5b977ff9a (patch) | |
tree | ee05c64bf15a3b9bfbc29dfa1095d1a763c90a87 | |
parent | 03687b7c66d7064870bbe8d01f889c85de1fad7d (diff) |
code cleanup: warnings
-rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 05661d4bc38..8fb4813fab7 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -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 } } } diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index f3548f776f5..580a69466c9 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -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) diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index e60ce562c6c..1e74354603b 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -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); |