3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index f9444abf206..3180ac4c8de 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -345,7 +345,7 @@ void bmesh_set_mdisps_space(BMesh *bm, int from, int to)
 		MDisps *mdisps;
 		BMFace *f;
 		BMIter iter;
-		int i;
+		// int i= 0; // UNUSED
 		
 		multires_set_space(dm, ob, from, to);
 		
@@ -372,7 +372,7 @@ void bmesh_set_mdisps_space(BMesh *bm, int from, int to)
 				}
 				
 				mdisps++;
-				i += 1;	
+				// i += 1;
 			}
 		}
 		
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index 699e6f96e22..04b8a81ad49 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -895,7 +895,7 @@ void *BMO_FirstElem(BMOperator *op, const char *slotname)
 }
 
 void *BMO_IterNew(BMOIter *iter, BMesh *UNUSED(bm), BMOperator *op,
-		  const char *slotname, int restrict)
+		  const char *slotname, int restrictmask)
 {
 	BMOpSlot *slot = BMO_GetSlot(op, slotname);
 
@@ -903,7 +903,7 @@ void *BMO_IterNew(BMOIter *iter, BMesh *UNUSED(bm), BMOperator *op,
 
 	iter->slot = slot;
 	iter->cur = 0;
-	iter->restrict = restrict;
+	iter->restrictmask = restrictmask;
 
 	if (iter->slot->slottype == BMOP_OPSLOT_MAPPING) {
 		if (iter->slot->data.ghash)
@@ -922,7 +922,7 @@ void *BMO_IterStep(BMOIter *iter)
 		if (iter->cur >= iter->slot->len) return NULL;
 
 		h = ((void**)iter->slot->data.buf)[iter->cur++];
-		while (!(iter->restrict & h->type)) {
+		while (!(iter->restrictmask & h->type)) {
 			if (iter->cur >= iter->slot->len) return NULL;
 			h = ((void**)iter->slot->data.buf)[iter->cur++];
 		}
diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c
index b6dc26fb6a9..09b6fba80a9 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.c
+++ b/source/blender/bmesh/intern/bmesh_walkers.c
@@ -101,7 +101,7 @@ void BMW_Init(BMWalker *walker, BMesh *bm, int type, int searchmask, int flag)
 	
 	if (type >= BMW_MAXWALKERS || type < 0) {
 		bmesh_error();
-		printf(stderr, "Invalid walker type in BMW_Init; type: %d, searchmask: %d, flag: %d\n", type, searchmask, flag);
+		fprintf(stderr, "Invalid walker type in BMW_Init; type: %d, searchmask: %d, flag: %d\n", type, searchmask, flag);
 	}
 	
 	if (type != BMW_CUSTOM) {