clear more warnings.

9 files changed, 35 insertions, 36 deletions

diff --git a/source/blender/bmesh/operators/bevel.c b/source/blender/bmesh/operators/bevel.c
index 315b252e843..7bcf516f161 100644
--- a/source/blender/bmesh/operators/bevel.c
+++ b/source/blender/bmesh/operators/bevel.c
@@ -67,12 +67,12 @@ static float BM_bevel_project_vec(float *vec1, float *vec2, float *up_vec, int i
 	return factor;
 }
 
-void calc_corner_co(BMesh *bm, BMLoop *l, float *co, float fac)
+void calc_corner_co(BMesh *UNUSED(bm), BMLoop *l, float *co, float fac)
 {
-	float no[3], tan[3], vec1[3], vec2[3], v1[3], v2[3], v3[3], v4[3];
-	float p1[3], p2[3], w[3];
-	float l1, l2;
-	int ret;
+	float /* no[3], tan[3], */ vec1[3], vec2[3], v1[3], v2[3], v3[3], v4[3];
+	// float p1[3], p2[3], w[3];
+	// float l1, l2;
+	// int ret;
 
 	copy_v3_v3(v1, l->prev->v->co);
 	copy_v3_v3(v2, l->v->co);
@@ -660,8 +660,8 @@ void bmesh_bevel_exec(BMesh *bm, BMOperator *op)
 			BMIter liter;
 			
 			BM_ITER(l, &liter, bm, BM_LOOPS_OF_VERT, v) {
-				BMIter liter2;
-				BMLoop *l2 = l->v == v ? l : l->next, *l3;
+				// BMIter liter2;
+				// BMLoop *l2 = l->v == v ? l : l->next, *l3;
 				
 				if (BMO_TestFlag(bm, l->f, FACE_OLD)) {
 					lorig = l;
@@ -673,7 +673,7 @@ void bmesh_bevel_exec(BMesh *bm, BMOperator *op)
 				continue;
 			
 			BM_ITER(l, &liter, bm, BM_LOOPS_OF_VERT, v) {
-				BMLoop *l2 = l->v == v ? l : l->next, *l3;
+				BMLoop *l2 = l->v == v ? l : l->next; //, *l3;
 				
 				BM_Copy_Attributes(bm, bm, lorig->f, l2->f);
 				BM_Copy_Attributes(bm, bm, lorig, l2);
diff --git a/source/blender/bmesh/operators/dissolveops.c b/source/blender/bmesh/operators/dissolveops.c
index db074921fff..7e41a1d934d 100644
--- a/source/blender/bmesh/operators/dissolveops.c
+++ b/source/blender/bmesh/operators/dissolveops.c
@@ -24,7 +24,7 @@ static int check_hole_in_region(BMesh *bm, BMFace *f) {
 	BMIter liter2;
 	BMLoop *l2, *l3;
 	BMFace *f2;
-	
+
 	/*checks if there are any unmarked boundary edges in the face region*/
 
 	BMW_Init(&regwalker, bm, BMW_ISLAND, FACE_MARK, 0);
diff --git a/source/blender/bmesh/operators/join_triangles.c b/source/blender/bmesh/operators/join_triangles.c
index 5b322489515..b5811924cda 100644
--- a/source/blender/bmesh/operators/join_triangles.c
+++ b/source/blender/bmesh/operators/join_triangles.c
@@ -41,7 +41,7 @@
 #define T2QJOIN		4
 
 /*assumes edges are validated before reaching this point*/
-static float measure_facepair(BMesh *bm, BMVert *v1, BMVert *v2, 
+static float measure_facepair(BMesh *UNUSED(bm), BMVert *v1, BMVert *v2,
 							  BMVert *v3, BMVert *v4, float limit)
 {
 	/*gives a 'weight' to a pair of triangles that join an edge to decide how good a join they would make*/
diff --git a/source/blender/bmesh/operators/mirror.c b/source/blender/bmesh/operators/mirror.c
index f53d8b7b762..d73fac47214 100644
--- a/source/blender/bmesh/operators/mirror.c
+++ b/source/blender/bmesh/operators/mirror.c
@@ -43,7 +43,7 @@ void bmesh_mirror_exec(BMesh *bm, BMOperator *op) {
 	BMIter iter;
 	BMVert *v, *v2, **vmap = NULL;
 	BLI_array_declare(vmap);
-	BMEdge *e, **emap = NULL;
+	BMEdge /*  *e, */ **emap = NULL;
 	BLI_array_declare(emap);
 	float mtx[4][4];
 	float imtx[4][4];
@@ -124,4 +124,3 @@ void bmesh_mirror_exec(BMesh *bm, BMOperator *op) {
 	BLI_array_free(vmap);
 	BLI_array_free(emap);
 }
-
diff --git a/source/blender/bmesh/operators/primitiveops.c b/source/blender/bmesh/operators/primitiveops.c
index 5f2409cbbc8..e62ad0a19a4 100644
--- a/source/blender/bmesh/operators/primitiveops.c
+++ b/source/blender/bmesh/operators/primitiveops.c
@@ -1,4 +1,4 @@
-#include "MEM_guardedalloc.h"-
+#include "MEM_guardedalloc.h"
 
 #include "DNA_meshdata_types.h"
 #include "DNA_mesh_types.h"
diff --git a/source/blender/bmesh/operators/removedoubles.c b/source/blender/bmesh/operators/removedoubles.c
index f806fd33a6b..2e73d0ad91c 100644
--- a/source/blender/bmesh/operators/removedoubles.c
+++ b/source/blender/bmesh/operators/removedoubles.c
@@ -271,7 +271,7 @@ void bmesh_vert_average_facedata_exec(BMesh *bm, BMOperator *op)
 	BMOIter siter;
 	BMIter iter;
 	BMVert *v;
-	BMLoop *l, *firstl = NULL;
+	BMLoop *l /* , *firstl = NULL */;
 	CDBlockBytes min, max;
 	void *block;
 	int i, type;
@@ -562,7 +562,7 @@ void bmesh_automerge_exec(BMesh *bm, BMOperator *op)
 	BMVert **verts=NULL;
 	BLI_array_declare(verts);
 	float dist, distsqr;
-	int i, j, len, keepvert;
+	int i, j, len /* , keepvert */;
 
 	dist = BMO_Get_Float(op, "dist");
 	distsqr = dist*dist;
diff --git a/source/blender/bmesh/operators/subdivideop.c b/source/blender/bmesh/operators/subdivideop.c
index f6833f8727b..320381e664c 100644
--- a/source/blender/bmesh/operators/subdivideop.c
+++ b/source/blender/bmesh/operators/subdivideop.c
@@ -115,7 +115,7 @@ BMEdge *connect_smallest_face(BMesh *bm, BMVert *v1, BMVert *v2, BMFace **nf) {
 	return NULL;
 }
 /* calculates offset for co, based on fractal, sphere or smooth settings  */
-static void alter_co(float *co, BMEdge *edge, subdparams *params, float perc,
+static void alter_co(float *co, BMEdge *UNUSED(edge), subdparams *params, float perc,
 		     BMVert *vsta, BMVert *vend)
 {
 	float vec1[3], fac;
@@ -376,12 +376,13 @@ v6--------v5
 v7-v0--v1-v2
 
 */
-static void quad_2edge_split_fan(BMesh *bm, BMFace *face, BMVert **verts, 
+static void quad_2edge_split_fan(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
                           subdparams *params)
 {
 	BMFace *nf;
-	BMVert *v, *lastv;
-	BMEdge *e, *ne;
+	// BMVert *v;
+	BMVert *lastv;
+	// BMEdge *e, *ne;
 	int i, numcuts = params->numcuts;
 	
 	lastv = verts[2];
@@ -409,7 +410,7 @@ v8--v7--v6-v5
 v9-v0--v1-v2
 
 */
-static void quad_3edge_split(BMesh *bm, BMFace *face, BMVert **verts, 
+static void quad_3edge_split(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
                           subdparams *params)
 {
 	BMFace *nf;
@@ -450,7 +451,7 @@ first line |          |   last line
 
 	   it goes from bottom up
 */
-static void quad_4edge_subdivide(BMesh *bm, BMFace *face, BMVert **verts, 
+static void quad_4edge_subdivide(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
                           subdparams *params)
 {
 	BMFace *nf;
@@ -458,7 +459,7 @@ static void quad_4edge_subdivide(BMesh *bm, BMFace *face, BMVert **verts,
 	BMEdge *e, *ne, temp;
 	BMVert **lines;
 	int numcuts = params->numcuts;
-	int i, j, a, b, s=numcuts+2, totv=numcuts*4+4;
+	int i, j, a, b, s=numcuts+2 /* , totv=numcuts*4+4 */;
 
 	lines = MEM_callocN(sizeof(BMVert*)*(numcuts+2)*(numcuts+2),
 		                     "q_4edge_split");
@@ -529,7 +530,7 @@ static void quad_4edge_subdivide(BMesh *bm, BMFace *face, BMVert **verts,
 v4--v0--v1--v2
     s    s
 */
-static void tri_1edge_split(BMesh *bm, BMFace *face, BMVert **verts, 
+static void tri_1edge_split(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
                           subdparams *params)
 {
 	BMFace *nf;
@@ -555,7 +556,7 @@ sv7/---v---\ v3 s
  v8--v0--v1--v2
     s    s
 */
-static void tri_3edge_subdivide(BMesh *bm, BMFace *face, BMVert **verts, 
+static void tri_3edge_subdivide(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
                           subdparams *params)
 {
 	BMFace *nf;
@@ -982,7 +983,7 @@ void esubdivide_exec(BMesh *bmesh, BMOperator *op)
 }
 
 /*editmesh-emulating function*/
-void BM_esubdivideflag(Object *obedit, BMesh *bm, int flag, float smooth, 
+void BM_esubdivideflag(Object *UNUSED(obedit), BMesh *bm, int flag, float smooth,
 		       float fractal, int beauty, int numcuts, 
 		       int seltype, int cornertype, int singleedge, int gridfill)
 {
@@ -999,7 +1000,7 @@ void BM_esubdivideflag(Object *obedit, BMesh *bm, int flag, float smooth,
 	if (seltype == SUBDIV_SELECT_INNER) {
 		BMOIter iter;
 		BMHeader *ele;
-		int i;
+		// int i;
 		
 		ele = BMO_IterNew(&iter, bm, &op, "outinner", BM_EDGE|BM_VERT);
 		for (; ele; ele=BMO_IterStep(&iter)) {
@@ -1008,7 +1009,7 @@ void BM_esubdivideflag(Object *obedit, BMesh *bm, int flag, float smooth,
 	} else if (seltype == SUBDIV_SELECT_LOOPCUT) {
 		BMOIter iter;
 		BMHeader *ele;
-		int i;
+		// int i;
 		
 		/*deselect input*/
 		BM_clear_flag_all(bm, BM_SELECT);
@@ -1072,4 +1073,3 @@ void esplit_exec(BMesh *bm, BMOperator *op)
 	BMO_Flag_To_Slot(bm, op, "outsplit",
 		         ELE_SPLIT, BM_ALL);
 }
-
diff --git a/source/blender/bmesh/operators/triangulateop.c b/source/blender/bmesh/operators/triangulateop.c
index c4755b38d29..ebcca7f7116 100644
--- a/source/blender/bmesh/operators/triangulateop.c
+++ b/source/blender/bmesh/operators/triangulateop.c
@@ -21,7 +21,7 @@ void triangulate_exec(BMesh *bm, BMOperator *op)
 	BLI_array_declare(newfaces);
 	float (*projectverts)[3] = NULL;
 	BLI_array_declare(projectverts);
-	int i, lastlen=0, count = 0;
+	int i, lastlen=0 /* , count = 0 */;
 	
 	face = BMO_IterNew(&siter, bm, op, "faces", BM_FACE);
 	for (; face; face=BMO_IterStep(&siter)) {
@@ -53,4 +53,4 @@ void triangulate_exec(BMesh *bm, BMOperator *op)
 	
 	BLI_array_free(projectverts);
 	BLI_array_free(newfaces);
-}
\ No newline at end of file
+}
diff --git a/source/blender/bmesh/operators/utils.c b/source/blender/bmesh/operators/utils.c
index 83d97280ef0..3a9ca0157a2 100644
--- a/source/blender/bmesh/operators/utils.c
+++ b/source/blender/bmesh/operators/utils.c
@@ -716,10 +716,10 @@ void bmesh_similaredges_exec(BMesh *bm, BMOperator *op)
 	BMIter	e_iter;		/* mesh edges iterator */
 	BMEdge	*es;		/* selected edge */
 	BMEdge	*e;		/* mesh edge */
-	int idx = 0, i = 0, f = 0;
+	int idx = 0, i = 0 /* , f = 0 */;
 	int *indices = NULL;
 	tmp_edge_ext *e_ext = NULL;
-	float *angles = NULL;
+	// float *angles = NULL;
 	float angle;
 
 	int num_sels = 0, num_total = 0;
@@ -982,7 +982,7 @@ void bmesh_rotateuvs_exec(BMesh *bm, BMOperator *op)
 	BMOIter fs_iter;	/* selected faces iterator */
 	BMFace *fs;	/* current face */
 	BMIter l_iter;	/* iteration loop */
-	int n;
+	// int n;
 
 	int dir = BMO_Get_Int(op, "dir");
 
@@ -1097,7 +1097,7 @@ void bmesh_rotatecolors_exec(BMesh *bm, BMOperator *op)
 	BMOIter fs_iter;	/* selected faces iterator */
 	BMFace *fs;	/* current face */
 	BMIter l_iter;	/* iteration loop */
-	int n;
+	// int n;
 
 	int dir = BMO_Get_Int(op, "dir");
 
@@ -1206,7 +1206,7 @@ typedef struct element_node {
 
 void bmesh_vertexshortestpath_exec(BMesh *bm, BMOperator *op)
 {
-	BMOIter vs_iter, vs2_iter;	/* selected verts iterator */
+	BMOIter vs_iter /* , vs2_iter */;	/* selected verts iterator */
 	BMIter v_iter;		/* mesh verts iterator */
 	BMVert *vs, *sv, *ev;	/* starting vertex, ending vertex */
 	BMVert *v;		/* mesh vertex */
@@ -1214,7 +1214,7 @@ void bmesh_vertexshortestpath_exec(BMesh *bm, BMOperator *op)
 
 	element_node *vert_list = NULL;
 
-	int num_total = 0, num_sels = 0, i = 0;
+	int num_total = 0 /*, num_sels = 0 */, i = 0;
 	int type = BMO_Get_Int(op, "type");
 
 	BMO_ITER(vs, &vs_iter, bm, op, "startv", BM_VERT)