[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54301] trunk/blender: code cleanup: warnings

[Campbell Barton]

Revision: 54301
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54301
Author:   campbellbarton
Date:     2013-02-04 16:20:39 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
code cleanup: warnings

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_curves.cpp
    trunk/blender/source/blender/blenkernel/intern/customdata.c
    trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c

Modified: trunk/blender/intern/cycles/blender/blender_curves.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_curves.cpp	2013-02-04 16:12:42 UTC (rev 54300)
+++ trunk/blender/intern/cycles/blender/blender_curves.cpp	2013-02-04 16:20:39 UTC (rev 54301)
@@ -828,7 +828,7 @@
 		return;
 
 	float time = 0.0f;
-	float prevtime = 0.0f;
+//	float prevtime = 0.0f; // UNUSED
 
 	int vertexindex = vert_offset;
 
@@ -865,7 +865,7 @@
 						}
 					}
 
-					prevtime = time;
+					// prevtime = time;  // UNUSED
 				}
 			}
 		}

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-02-04 16:12:42 UTC (rev 54300)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-02-04 16:20:39 UTC (rev 54301)
@@ -1242,12 +1242,15 @@
 	}
 }
 
+/* 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)

Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c	2013-02-04 16:12:42 UTC (rev 54300)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c	2013-02-04 16:20:39 UTC (rev 54301)
@@ -384,6 +384,7 @@
 	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);