skip assigning vars for inline bmesh flag funcs, just cast.

8 files changed, 30 insertions, 43 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index f1cc409b87f..62f9c65d2ea 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -358,7 +358,6 @@ static void dm_add_polys_from_iter(CustomData *ldata, CustomData *pdata, Derived
 void DM_DupPolys(DerivedMesh *source, DerivedMesh *target)
 {
 	DMFaceIter *iter = source->newFaceIter(source);
-	DMLoopIter *liter;
 	int totloop = source->numLoopData;
 
 	dm_add_polys_from_iter(&target->loopData, &target->polyData, source, totloop);
@@ -921,7 +920,7 @@ void vDM_ColorBand_store(ColorBand *coba)
 
 static void add_weight_mcol_dm(Object *ob, DerivedMesh *dm)
 {
-	Mesh *me = ob->data;
+	// Mesh *me = ob->data; // UNUSED
 	MFace *mf = dm->getTessFaceArray(dm);
 	DMFaceIter *dfiter;
 	DMLoopIter *dliter;
diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h
index 99c63c0c2f5..93632416d9e 100644
--- a/source/blender/bmesh/bmesh.h
+++ b/source/blender/bmesh/bmesh.h
@@ -143,18 +143,18 @@ defining edges[0], and define the winding of the new face.*/
 struct BMFace *BM_Make_Ngon ( struct BMesh *bm, struct BMVert *v1, struct BMVert *v2, struct BMEdge **edges, int len, int nodouble );
 
 /*stuff for dealing with header flags*/
-BM_INLINE int BM_TestHFlag(void *element, int flag);
+BM_INLINE int BM_TestHFlag(void *element, const int flag);
 
 /*stuff for dealing with header flags*/
-BM_INLINE void BM_SetHFlag(void *element, int flag);
+BM_INLINE void BM_SetHFlag(void *element, const int flag);
 
 /*stuff for dealing with header flags*/
-BM_INLINE void BM_ClearHFlag(void *element, int flag);
+BM_INLINE void BM_ClearHFlag(void *element, const int flag);
 
 /*stuff for dealing BM_ToggleHFlag header flags*/
-BM_INLINE void BM_ToggleHFlag(void *element, int flag);
-BM_INLINE void BM_SetIndex(void *element, int index);
-BM_INLINE int BM_GetIndex(void *element);
+BM_INLINE void BM_ToggleHFlag(void *element, const int flag);
+BM_INLINE void BM_SetIndex(void *element, const int index);
+BM_INLINE int BM_GetIndex(const void *element);
 
 /*copies loop data from adjacent faces*/
 void BM_Face_CopyShared ( BMesh *bm, BMFace *f );
diff --git a/source/blender/bmesh/intern/bmesh_inline.c b/source/blender/bmesh/intern/bmesh_inline.c
index 19af07cffb2..f251063b8fb 100644
--- a/source/blender/bmesh/intern/bmesh_inline.c
+++ b/source/blender/bmesh/intern/bmesh_inline.c
@@ -3,43 +3,38 @@
 
 #include "bmesh.h"
 
-BM_INLINE int BM_TestHFlag(void *element, int flag)
+BM_INLINE int BM_TestHFlag(void *element, const int flag)
 {
 	BMHeader *e = element;
 	return e->flag & flag;
 }
 
 /*stuff for dealing with header flags*/
-BM_INLINE void BM_SetHFlag(void *element, int flag)
+BM_INLINE void BM_SetHFlag(void *element, const int flag)
 {
-	BMHeader *e = element;
-	e->flag |= flag;
+	((BMHeader *)element)->flag |= flag;
 }
 
 /*stuff for dealing with header flags*/
-BM_INLINE void BM_ClearHFlag(void *element, int flag)
+BM_INLINE void BM_ClearHFlag(void *element, const int flag)
 {
-	BMHeader *e = element;
-	e->flag &= ~flag;
+	((BMHeader *)element)->flag &= ~flag;
 }
 
 /*stuff for dealing BM_ToggleHFlag header flags*/
-BM_INLINE void BM_ToggleHFlag(void *element, int flag)
+BM_INLINE void BM_ToggleHFlag(void *element, const int flag)
 {
-	BMHeader *e = element;
-	e->flag ^= flag;
+	((BMHeader *)element)->flag ^= flag;
 }
 
-BM_INLINE void BM_SetIndex(void *element, int index)
+BM_INLINE void BM_SetIndex(void *element, const int index)
 {
-	BMHeader *e = element;
-	e->index = index;
+	((BMHeader *)element)->index = index;
 }
 
-BM_INLINE int BM_GetIndex(void *element)
+BM_INLINE int BM_GetIndex(const void *element)
 {
-	BMHeader *e = element;
-	return e->index;
+	return ((BMHeader *)element)->index;
 }
 
 #endif /*BM_INLINE_C*/
diff --git a/source/blender/bmesh/intern/bmesh_newcore.c b/source/blender/bmesh/intern/bmesh_newcore.c
index c8705dc4c90..18a7b279a6f 100644
--- a/source/blender/bmesh/intern/bmesh_newcore.c
+++ b/source/blender/bmesh/intern/bmesh_newcore.c
@@ -121,7 +121,6 @@ static BMLoop *bmesh_create_loop(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f, BML
 static BMLoop *BM_Add_FaceBoundary(BMesh *bm, BMFace *f, BMVert *startv, BMEdge *starte) {
 	BMLoopList *lst = BLI_mempool_calloc(bm->looplistpool);
 	BMLoop *l = (BMLoop*)bmesh_create_loop(bm, startv, starte, f, NULL);
-	int i;
 	
 	bmesh_radial_append(starte, l);
 
@@ -356,8 +355,6 @@ int bmesh_check_element(BMesh *UNUSED(bm), void *element, int type) {
 }
 
 static void bmesh_kill_loop(BMesh *bm, BMLoop *l) {
-	int i;
-	
 	bm->totloop--;
 	if (l->head.data)
 		CustomData_bmesh_free_block(&bm->ldata, &l->head.data);
@@ -407,8 +404,7 @@ void BM_Kill_Face_Verts(BMesh *bm, BMFace *f) {
 
 void BM_Kill_Face(BMesh *bm, BMFace *f) {
 	BMLoopList *ls, *lsnext;
-	int i;
-	
+
 	CHECK_ELEMENT(bm, f);
 
 	for (ls=f->loops.first; ls; ls=lsnext) {
@@ -442,8 +438,7 @@ void BM_Kill_Face(BMesh *bm, BMFace *f) {
 }
 
 void BM_Kill_Edge(BMesh *bm, BMEdge *e) {
-	int i;
-	
+
 	bmesh_disk_remove_edge(e, e->v1);
 	bmesh_disk_remove_edge(e, e->v2);
 		
@@ -934,7 +929,7 @@ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2,
 				   BMLoop **rl, ListBase *holes)
 {
 
-	BMFace *f2, *of1, *of2;
+	BMFace *f2;
 	BMLoop *v1loop = NULL, *v2loop = NULL, *curloop, *f1loop=NULL, *f2loop=NULL;
 	BMEdge *e;
 	BMLoopList *lst, *lst2;
diff --git a/source/blender/bmesh/operators/bevel.c b/source/blender/bmesh/operators/bevel.c
index aa3311e70f0..1a10b3eb5ef 100644
--- a/source/blender/bmesh/operators/bevel.c
+++ b/source/blender/bmesh/operators/bevel.c
@@ -140,8 +140,8 @@ static void calc_corner_co(BMesh *bm, BMLoop *l, float *co, float fac)
 #endif
 }
 
-#define ETAG_SET(e, v, nv) (v) == (e)->v1 ? (etags[BM_GetIndex((e))].newv1 = (nv)) : (etags[BMINDEX_GET((e))].newv2 = (nv))
-#define ETAG_GET(e, v) ((v) == (e)->v1 ? (etags[BM_GetIndex((e))].newv1) : (etags[BMINDEX_GET((e))].newv2))
+#define ETAG_SET(e, v, nv) (v) == (e)->v1 ? (etags[BM_GetIndex((e))].newv1 = (nv)) : (etags[BM_GetIndex((e))].newv2 = (nv))
+#define ETAG_GET(e, v) ((v) == (e)->v1 ? (etags[BM_GetIndex((e))].newv1) : (etags[BM_GetIndex((e))].newv2))
 
 void bmesh_bevel_exec(BMesh *bm, BMOperator *op)
 {
diff --git a/source/blender/bmesh/operators/createops.c b/source/blender/bmesh/operators/createops.c
index 4d591d89cbc..aa1c0397404 100644
--- a/source/blender/bmesh/operators/createops.c
+++ b/source/blender/bmesh/operators/createops.c
@@ -335,7 +335,8 @@ static void init_rotsys(BMesh *bm, EdgeData *edata, VertData *vdata)
 	BMEdge *e;
 	BMEdge **edges = NULL;
 	BLI_array_staticdeclare(edges, 256);
-	BMVert *v, *lastv, **verts = NULL;
+	BMVert *v, *lastv;
+	/*BMVert **verts = NULL; */
 	/*BLI_array_staticdeclare(verts, 256);*/ /*UNUSED*/
 	int i;
 	
@@ -655,6 +656,7 @@ static float edge_weight_path(EPath *path, EdgeData *edata, VertData *UNUSED(vda
 			w += edata[BM_GetIndex(node->e)].ftag;
 			if (node->prev) {
 				/*BMESH_TODO*/
+				(void)first;
 				//w += len_v3v3(node->v->co, first->e->v1->co)*0.0001f;
 				//w += len_v3v3(node->v->co, first->e->v2->co)*0.0001f;				
 			}
@@ -682,7 +684,7 @@ static void edge_free_path(PathBase *pathbase, EPath *path)
 static EPath *edge_find_shortest_path(BMesh *bm, BMOperator *op, BMEdge *edge, EdgeData *edata, 
 								VertData *vdata, PathBase *pathbase, int group)
 {
-	BMEdge *e, *starte;
+	BMEdge *e;
 	GHash *gh = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "createops find shortest path");
 	BMVert *v1, *v2;
 	BMVert **verts = NULL;
@@ -988,8 +990,7 @@ static BMEdge *edge_next(BMesh *bm, BMEdge *e)
 void bmesh_edgenet_prepare(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
-	BMIter iter;
-	BMEdge *e, *e2;
+	BMEdge *e;
 	BMEdge **edges1 = NULL, **edges2 = NULL, **edges;
 	BLI_array_declare(edges1);
 	BLI_array_declare(edges2);
diff --git a/source/blender/bmesh/operators/dissolveops.c b/source/blender/bmesh/operators/dissolveops.c
index 910a244b616..552b97ad431 100644
--- a/source/blender/bmesh/operators/dissolveops.c
+++ b/source/blender/bmesh/operators/dissolveops.c
@@ -50,15 +50,13 @@ static int check_hole_in_region(BMesh *bm, BMFace *f) {
 void dissolvefaces_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter oiter;
-	BMIter liter, liter2, liter3;
-	BMLoop *l, *l2, *l3;
 	BMFace *f, *f2 /* , *nf = NULL */;
 	BLI_array_declare(faces);
 	BLI_array_declare(regions);
 	BMFace ***regions = NULL;
 	BMFace **faces = NULL;
 	BMWalker regwalker;
-	int i, j, fcopied;
+	int i;
 
 	BMO_Flag_Buffer(bm, op, "faces", FACE_MARK, BM_FACE);
 	
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 50fe6a04ed4..7a955eef66a 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -901,7 +901,7 @@ static int unwrap_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
-	BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh;
+	/* BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh; */ /*UNUSED*/
 	ParamHandle *handle;
 	int method = RNA_enum_get(op->ptr, "method");
 	int fill_holes = RNA_boolean_get(op->ptr, "fill_holes");
@@ -1066,7 +1066,6 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op))
 	BMFace *efa;
 	BMLoop *l;
 	BMIter iter, liter;
-	MTexPoly *tf;
 	MLoopUV *luv;
 	BLI_array_declare(uvs);
 	float **uvs = NULL;