code cleanup: remove unused BMesh args.

4 files changed, 23 insertions, 23 deletions

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 6c254dc4d19..0559237343a 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -4313,7 +4313,7 @@ int BoneEnvelope(TransInfo *t, const int UNUSED(mval[2]))
 }
 
 /* ********************  Edge Slide   *************** */
-static BMEdge *get_other_edge(BMesh *bm, BMVert *v, BMEdge *e)
+static BMEdge *get_other_edge(BMVert *v, BMEdge *e)
 {
 	BMIter iter;
 	BMEdge *e2;
@@ -4326,7 +4326,7 @@ static BMEdge *get_other_edge(BMesh *bm, BMVert *v, BMEdge *e)
 	return NULL;
 }
 
-static BMLoop *get_next_loop(BMesh *UNUSED(bm), BMVert *v, BMLoop *l, 
+static BMLoop *get_next_loop(BMVert *v, BMLoop *l,
                              BMEdge *olde, BMEdge *nexte, float vec[3])
 {
 	BMLoop *firstl;
@@ -4419,7 +4419,7 @@ static int createSlideVerts(TransInfo *t)
 	BLI_smallhash_init(&table);
 	
 	/*ensure valid selection*/
-	BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
+	BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
 		if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
 			numsel = 0;
 			BM_ITER_ELEM (e, &iter2, v, BM_EDGES_OF_VERT) {
@@ -4440,7 +4440,7 @@ static int createSlideVerts(TransInfo *t)
 		}
 	}
 
-	BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
 		if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
 			if (!BM_edge_is_manifold(e)) {
 				MEM_freeN(sld);
@@ -4451,7 +4451,7 @@ static int createSlideVerts(TransInfo *t)
 	}
 
 	j = 0;
-	BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
+	BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
 		if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
 			BM_elem_flag_enable(v, BM_ELEM_TAG);
 			BLI_smallhash_insert(&table, (uintptr_t)v, SET_INT_IN_POINTER(j));
@@ -4473,7 +4473,7 @@ static int createSlideVerts(TransInfo *t)
 	j = 0;
 	while (1) {
 		v = NULL;
-		BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
+		BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
 			if (BM_elem_flag_test(v, BM_ELEM_TAG))
 				break;
 
@@ -4493,7 +4493,7 @@ static int createSlideVerts(TransInfo *t)
 		/*first, rewind*/
 		numsel = 0;
 		do {
-			e = get_other_edge(bm, v, e);
+			e = get_other_edge(v, e);
 			if (!e) {
 				e = v->e;
 				break;
@@ -4546,7 +4546,7 @@ static int createSlideVerts(TransInfo *t)
 			v2=v, v = BM_edge_other_vert(e, v);
 
 			e1 = e;
-			e = get_other_edge(bm, v, e);
+			e = get_other_edge(v, e);
 			if (!e) {
 				//v2=v, v = BM_edge_other_vert(l1->e, v);
 
@@ -4571,8 +4571,8 @@ static int createSlideVerts(TransInfo *t)
 				break;
 			}
 
-			l1 = get_next_loop(bm, v, l1, e1, e, vec);
-			l2 = l2 ? get_next_loop(bm, v, l2, e1, e, vec2) : NULL;
+			l1 = get_next_loop(v, l1, e1, e, vec);
+			l2 = l2 ? get_next_loop(v, l2, e1, e, vec2) : NULL;
 
 			j += 1;
 
@@ -4591,7 +4591,7 @@ static int createSlideVerts(TransInfo *t)
 	/* size = 50.0; */ /* UNUSED */
 	zero_v3(lastvec); zero_v3(dir);
 	/* ee = le = NULL; */ /* UNUSED */
-	BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
+	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
 		if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
 			BMIter iter2;
 			BMEdge *e2;
@@ -4639,7 +4639,7 @@ static int createSlideVerts(TransInfo *t)
 		}
 	}
 
-	bmesh_edit_begin(em->bm, BMO_OP_FLAG_UNTAN_MULTIRES);
+	bmesh_edit_begin(bm, BMO_OP_FLAG_UNTAN_MULTIRES);
 
 	/*create copies of faces for customdata projection*/
 	tempsv = sld->sv;
@@ -4651,14 +4651,14 @@ static int createSlideVerts(TransInfo *t)
 		BM_ITER_ELEM (f, &fiter, tempsv->v, BM_FACES_OF_VERT) {
 			
 			if (!BLI_smallhash_haskey(&sld->origfaces, (uintptr_t)f)) {
-				BMFace *copyf = BM_face_copy(em->bm, f, TRUE, TRUE);
+				BMFace *copyf = BM_face_copy(bm, f, TRUE, TRUE);
 				
-				BM_elem_select_set(em->bm, copyf, FALSE);
+				BM_elem_select_set(bm, copyf, FALSE);
 				BM_elem_flag_enable(copyf, BM_ELEM_HIDDEN);
 				BM_ITER_ELEM (l, &liter, copyf, BM_LOOPS_OF_FACE) {
-					BM_elem_select_set(em->bm, l->v, FALSE);
+					BM_elem_select_set(bm, l->v, FALSE);
 					BM_elem_flag_enable(l->v, BM_ELEM_HIDDEN);
-					BM_elem_select_set(em->bm, l->e, FALSE);
+					BM_elem_select_set(bm, l->e, FALSE);
 					BM_elem_flag_enable(l->e, BM_ELEM_HIDDEN);
 				}
 
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 2b60ff353d7..ba720ea8087 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1953,7 +1953,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 }
 
 /* loop-in-a-loop I know, but we need it! (ton) */
- static void get_face_center(float cent_r[3], BMesh *bm, BMVert *eve)
+ static void get_face_center(float cent_r[3], BMVert *eve)
 
 {
 	BMFace *efa;
@@ -1961,13 +1961,13 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 
 	BM_ITER_ELEM (efa, &iter, eve, BM_FACES_OF_VERT) {
 		if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
-			BM_face_center_mean_calc(bm, efa, cent_r);
+			BM_face_center_mean_calc(efa, cent_r);
 			break;
 		}
 	}
 }
 
-static void get_edge_center(float cent_r[3], BMesh *bm, BMVert *eve)
+static void get_edge_center(float cent_r[3], BMVert *eve)
 {
 	BMEdge *eed;
 	BMIter iter;
@@ -1993,9 +1993,9 @@ static void VertsToTransData(TransInfo *t, TransData *td, BMEditMesh *em, BMVert
 
 	if (t->around==V3D_LOCAL) {
 		if (em->selectmode & SCE_SELECT_FACE)
-			get_face_center(td->center, em->bm, eve);
+			get_face_center(td->center, eve);
 		else if (em->selectmode & SCE_SELECT_EDGE)
-			get_edge_center(td->center, em->bm, eve);
+			get_edge_center(td->center, eve);
 	}
 	copy_v3_v3(td->iloc, td->loc);
 
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index eb04ad04aa7..a7f58373e41 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1524,7 +1524,7 @@ void calculateCenter(TransInfo *t)
 				BMEditMesh *em = BMEdit_FromObject(t->obedit);
 
 				if (EDBM_editselection_active_get(em, &ese)) {
-					EDBM_editselection_center(em, t->center, &ese);
+					EDBM_editselection_center(t->center, &ese);
 					calculateCenter2D(t);
 					break;
 				}
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 180c631d39a..82e57cca705 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -301,7 +301,7 @@ int calc_manipulator_stats(const bContext *C)
 
 			/* USE LAST SELECTE WITH ACTIVE */
 			if (v3d->around==V3D_ACTIVE && EDBM_editselection_active_get(em, &ese)) {
-				EDBM_editselection_center(em, vec, &ese);
+				EDBM_editselection_center(vec, &ese);
 				calc_tw_center(scene, vec);
 				totsel= 1;
 			}