minor bmesh api naming edits.

13 files changed, 58 insertions, 58 deletions

diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index bad6107c8ab..e1c66a6d43e 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -726,7 +726,7 @@ static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm
 	int i, k, /*numGrids,*/ gridSize, dGridSize, dSkip;
 	int totloop, totpoly;
 	
-	/*this happens in the dm made by bmesh_set_mdisps_space*/
+	/* this happens in the dm made by bmesh_mdisps_space_set */
 	if (dm2 && CustomData_has_layer(&dm2->loopData, CD_MDISPS)) {
 		mpoly = CustomData_get_layer(&dm2->polyData, CD_MPOLY);
 		mdisps = CustomData_get_layer(&dm2->loopData, CD_MDISPS);
diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h
index 8871b090910..c72f846ed26 100644
--- a/source/blender/bmesh/bmesh.h
+++ b/source/blender/bmesh/bmesh.h
@@ -342,8 +342,8 @@ BMEdge *BM_edge_at_index(BMesh *bm, const int index);
 BMFace *BM_face_at_index(BMesh *bm, const int index);
 
 /*start/stop edit*/
-void bmesh_begin_edit(BMesh *bm, int flag);
-void bmesh_end_edit(BMesh *bm, int flag);
+void bmesh_edit_begin(BMesh *bm, int flag);
+void bmesh_edit_end(BMesh *bm, int flag);
 
 
 #ifdef USE_BMESH_HOLES
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index a1f95739f49..5267483af00 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -235,7 +235,7 @@ void BM_mesh_normals_update(BMesh *bm, const short skip_hidden)
 			continue;
 #endif
 
-		bmesh_update_face_normal(bm, f, f->no, projectverts);
+		bmesh_face_normal_update(bm, f, f->no, projectverts);
 	}
 	
 	/* Zero out vertex normals */
@@ -351,7 +351,7 @@ static void bmesh_rationalize_normals(BMesh *bm, int undo)
 	BMO_op_finish(bm, &bmop);
 }
 
-static void bmesh_set_mdisps_space(BMesh *bm, int from, int to)
+static void bmesh_mdisps_space_set(BMesh *bm, int from, int to)
 {
 	/* switch multires data out of tangent space */
 	if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
@@ -410,7 +410,7 @@ static void bmesh_set_mdisps_space(BMesh *bm, int from, int to)
  *  the editing operations are done. These are called by the tools/operator
  *  API for each time a tool is executed.
  */
-void bmesh_begin_edit(BMesh *bm, int flag)
+void bmesh_edit_begin(BMesh *bm, int flag)
 {
 	bm->opflag = flag;
 	
@@ -422,7 +422,7 @@ void bmesh_begin_edit(BMesh *bm, int flag)
 #if BMOP_UNTAN_MULTIRES_ENABLED
 	/* switch multires data out of tangent space */
 	if ((flag & BMO_OP_FLAG_UNTAN_MULTIRES) && CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
-		bmesh_set_mdisps_space(bm, MULTIRES_SPACE_TANGENT, MULTIRES_SPACE_ABSOLUTE);
+		bmesh_mdisps_space_set(bm, MULTIRES_SPACE_TANGENT, MULTIRES_SPACE_ABSOLUTE);
 
 		/* ensure correct normals, if possible */
 		bmesh_rationalize_normals(bm, 0);
@@ -438,15 +438,15 @@ void bmesh_begin_edit(BMesh *bm, int flag)
 #endif
 }
 
-void bmesh_end_edit(BMesh *bm, int flag)
+void bmesh_edit_end(BMesh *bm, int flag)
 {
-	/* BMO_OP_FLAG_UNTAN_MULTIRES disabled for now, see comment above in bmesh_begin_edit. */
+	/* BMO_OP_FLAG_UNTAN_MULTIRES disabled for now, see comment above in bmesh_edit_begin. */
 #if BMOP_UNTAN_MULTIRES_ENABLED
 	/* switch multires data into tangent space */
 	if ((flag & BMO_OP_FLAG_UNTAN_MULTIRES) && CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
 		/* set normals to their previous winding */
 		bmesh_rationalize_normals(bm, 1);
-		bmesh_set_mdisps_space(bm, MULTIRES_SPACE_ABSOLUTE, MULTIRES_SPACE_TANGENT);
+		bmesh_mdisps_space_set(bm, MULTIRES_SPACE_ABSOLUTE, MULTIRES_SPACE_TANGENT);
 	}
 	else if (flag & BMO_OP_FLAG_RATIONALIZE_NORMALS) {
 		bmesh_rationalize_normals(bm, 1);
diff --git a/source/blender/bmesh/intern/bmesh_newcore.c b/source/blender/bmesh/intern/bmesh_newcore.c
index c0a2962221b..e0f50481e00 100644
--- a/source/blender/bmesh/intern/bmesh_newcore.c
+++ b/source/blender/bmesh/intern/bmesh_newcore.c
@@ -153,7 +153,7 @@ BMEdge *BM_edge_create(BMesh *bm, BMVert *v1, BMVert *v2, const BMEdge *example,
 	return e;
 }
 
-static BMLoop *bmesh_create_loop(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f, const BMLoop *example)
+static BMLoop *bmesh_loop_create(BMesh *bm, BMVert *v, BMEdge *e, BMFace *f, const BMLoop *example)
 {
 	BMLoop *l = NULL;
 
@@ -181,7 +181,7 @@ static BMLoop *bm_face_boundary_add(BMesh *bm, BMFace *f, BMVert *startv, BMEdge
 #ifdef USE_BMESH_HOLES
 	BMLoopList *lst = BLI_mempool_calloc(bm->looplistpool);
 #endif
-	BMLoop *l = bmesh_create_loop(bm, startv, starte, f, NULL);
+	BMLoop *l = bmesh_loop_create(bm, startv, starte, f, NULL);
 	
 	bmesh_radial_append(starte, l);
 
@@ -301,7 +301,7 @@ BMFace *BM_face_create(BMesh *bm, BMVert **verts, BMEdge **edges, const int len,
 	startl->v = verts[0];
 	startl->e = edges[0];
 	for (i = 1; i < len; i++) {
-		l = bmesh_create_loop(bm, verts[i], edges[i], f, edges[i]->l);
+		l = bmesh_loop_create(bm, verts[i], edges[i], f, edges[i]->l);
 		
 		l->f = f;
 		bmesh_radial_append(edges[i], l);
@@ -330,7 +330,7 @@ BMFace *BM_face_create(BMesh *bm, BMVert **verts, BMEdge **edges, const int len,
 	return f;
 }
 
-int bmesh_check_element(BMesh *UNUSED(bm), void *element, const char htype)
+int bmesh_element_check(BMesh *UNUSED(bm), void *element, const char htype)
 {
 	BMHeader *head = element;
 	int err = 0;
@@ -761,7 +761,7 @@ int bmesh_loop_reverse(BMesh *bm, BMFace *f)
 #endif
 }
 
-static void bmesh_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
+static void bmesh_elements_systag_enable(BMesh *UNUSED(bm), void *veles, int tot, int flag)
 {
 	BMHeader **eles = veles;
 	int i;
@@ -771,7 +771,7 @@ static void bmesh_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int f
 	}
 }
 
-static void bmesh_clear_systag_elements(BMesh *UNUSED(bm), void *veles, int tot, int flag)
+static void bmesh_elements_systag_disable(BMesh *UNUSED(bm), void *veles, int tot, int flag)
 {
 	BMHeader **eles = veles;
 	int i;
@@ -896,7 +896,7 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface)
 	if (totface == 1)
 		return faces[0];
 
-	bmesh_systag_elements(bm, faces, totface, _FLAG_JF);
+	bmesh_elements_systag_enable(bm, faces, totface, _FLAG_JF);
 
 	for (i = 0; i < totface; i++) {
 		f = faces[i];
@@ -1007,7 +1007,7 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface)
 		} while ((l_iter = l_iter->next) != l_first);
 	}
 
-	bmesh_clear_systag_elements(bm, faces, totface, _FLAG_JF);
+	bmesh_elements_systag_disable(bm, faces, totface, _FLAG_JF);
 	BM_ELEM_API_FLAG_DISABLE(newf, _FLAG_JF);
 
 	/* handle multires data */
@@ -1036,7 +1036,7 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface)
 	BM_CHECK_ELEMENT(bm, newf);
 	return newf;
 error:
-	bmesh_clear_systag_elements(bm, faces, totface, _FLAG_JF);
+	bmesh_elements_systag_disable(bm, faces, totface, _FLAG_JF);
 	BLI_array_free(edges);
 	BLI_array_free(deledges);
 	BLI_array_free(delverts);
@@ -1158,8 +1158,8 @@ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2,
 	e = BM_edge_create(bm, v1, v2, example, FALSE);
 
 	f2 = bmesh_addpolylist(bm, f);
-	f1loop = bmesh_create_loop(bm, v2, e, f, v2loop);
-	f2loop = bmesh_create_loop(bm, v1, e, f2, v1loop);
+	f1loop = bmesh_loop_create(bm, v2, e, f, v2loop);
+	f2loop = bmesh_loop_create(bm, v1, e, f2, v1loop);
 
 	f1loop->prev = v2loop->prev;
 	f2loop->prev = v1loop->prev;
@@ -1307,7 +1307,7 @@ BMVert *bmesh_semv(BMesh *bm, BMVert *tv, BMEdge *e, BMEdge **re)
 			nextl = nextl != nextl->radial_next ? nextl->radial_next : NULL;
 			bmesh_radial_loop_remove(l, NULL);
 
-			nl = bmesh_create_loop(bm, NULL, NULL, l->f, l);
+			nl = bmesh_loop_create(bm, NULL, NULL, l->f, l);
 			nl->prev = l;
 			nl->next = (l->next);
 			nl->prev->next = nl;
@@ -1768,7 +1768,7 @@ static int bmesh_vert_splice(BMesh *bm, BMVert *v, BMVert *vtarget)
  * vertex for each region. returns an array of all resulting
  * vertices.
  */
-static int bmesh_cutvert(BMesh *bm, BMVert *v, BMVert ***vout, int *len)
+static int bmesh_vert_cut(BMesh *bm, BMVert *v, BMVert ***vout, int *len)
 {
 	BMEdge **stack = NULL;
 	BLI_array_declare(stack);
@@ -1780,7 +1780,7 @@ static int bmesh_cutvert(BMesh *bm, BMVert *v, BMVert ***vout, int *len)
 	int i, maxindex;
 	BMLoop *nl;
 
-	visithash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "bmesh_cutvert visithash");
+	visithash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "bmesh_vert_cut visithash");
 
 	maxindex = 0;
 	BM_ITER(e, &eiter, bm, BM_EDGES_OF_VERT, v) {
@@ -1808,7 +1808,7 @@ static int bmesh_cutvert(BMesh *bm, BMVert *v, BMVert ***vout, int *len)
 	}
 
 	/* Make enough verts to split v for each group */
-	verts = MEM_callocN(sizeof(BMVert *) * maxindex, "bmesh_cutvert");
+	verts = MEM_callocN(sizeof(BMVert *) * maxindex, "bmesh_vert_cut");
 	verts[0] = v;
 	for (i = 1; i < maxindex; i++) {
 		verts[i] = BM_vert_create(bm, v->co, v);
@@ -1908,7 +1908,7 @@ static int bmesh_edge_splice(BMesh *bm, BMEdge *e, BMEdge *etarget)
  * Does nothing if cutl is already the only loop in the
  * edge radial.
  */
-static int bmesh_cutedge(BMesh *bm, BMEdge *e, BMLoop *cutl)
+static int bmesh_edge_cut(BMesh *bm, BMEdge *e, BMLoop *cutl)
 {
 	BMEdge *ne;
 	int radlen;
@@ -1954,8 +1954,8 @@ static BMVert *bmesh_urmv_loop(BMesh *bm, BMLoop *sl)
 
 	/* peel the face from the edge radials on both sides of the
 	 * loop vert, disconnecting the face from its fan */
-	bmesh_cutedge(bm, sl->e, sl);
-	bmesh_cutedge(bm, sl->prev->e, sl->prev);
+	bmesh_edge_cut(bm, sl->e, sl);
+	bmesh_edge_cut(bm, sl->prev->e, sl->prev);
 
 	if (bmesh_disk_count(sv) == 2) {
 		/* If there are still only two edges out of sv, then
@@ -1964,7 +1964,7 @@ static BMVert *bmesh_urmv_loop(BMesh *bm, BMLoop *sl)
 	}
 
 	/* Update the disk start, so that v->e points to an edge
-	 * not touching the split loop. This is so that bmesh_cutvert
+	 * not touching the split loop. This is so that bmesh_vert_cut
 	 * will leave the original sv on some *other* fan (not the
 	 * one-face fan that holds the unglue face). */
 	while (sv->e == sl->e || sv->e == sl->prev->e) {
@@ -1973,7 +1973,7 @@ static BMVert *bmesh_urmv_loop(BMesh *bm, BMLoop *sl)
 
 	/* Split all fans connected to the vert, duplicating it for
 	 * each fans. */
-	bmesh_cutvert(bm, sv, &vtar, &len);
+	bmesh_vert_cut(bm, sv, &vtar, &len);
 
 	/* There should have been at least two fans cut apart here,
 	 * otherwise the early exit would have kicked in. */
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index c83ffca2754..c2054a52afc 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -176,11 +176,11 @@ void BMO_op_exec(BMesh *bm, BMOperator *op)
 	BMO_push(bm, op);
 
 	if (bm->stackdepth == 2)
-		bmesh_begin_edit(bm, op->flag);
+		bmesh_edit_begin(bm, op->flag);
 	op->exec(bm, op);
 	
 	if (bm->stackdepth == 2)
-		bmesh_end_edit(bm, op->flag);
+		bmesh_edit_end(bm, op->flag);
 	
 	BMO_pop(bm);
 }
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index 8188413bb8c..dc8140d678c 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -422,7 +422,7 @@ void BM_face_normal_update(BMesh *bm, BMFace *f)
 
 		BLI_array_fixedstack_declare(proj, BM_NGON_STACK_SIZE, f->len, __func__);
 
-		bmesh_update_face_normal(bm, f, f->no, proj);
+		bmesh_face_normal_update(bm, f, f->no, proj);
 
 		BLI_array_fixedstack_free(proj);
 	}
@@ -435,7 +435,7 @@ void BM_face_normal_update_vcos(BMesh *bm, BMFace *f, float no[3], float (*verte
 
 		BLI_array_fixedstack_declare(proj, BM_NGON_STACK_SIZE, f->len, __func__);
 
-		bmesh_update_face_normal_vertex_cos(bm, f, no, proj, vertexCos);
+		bmesh_face_normal_update_vertex_cos(bm, f, no, proj, vertexCos);
 
 		BLI_array_fixedstack_free(proj);
 	}
@@ -499,7 +499,7 @@ void BM_vert_normal_update_all(BMesh *bm, BMVert *v)
 	BM_vert_normal_update(bm, v);
 }
 
-void bmesh_update_face_normal(BMesh *bm, BMFace *f, float no[3],
+void bmesh_face_normal_update(BMesh *bm, BMFace *f, float no[3],
                               float (*projectverts)[3])
 {
 	BMLoop *l;
@@ -541,8 +541,8 @@ void bmesh_update_face_normal(BMesh *bm, BMFace *f, float no[3],
 		}
 	}
 }
-/* exact same as 'bmesh_update_face_normal' but accepts vertex coords */
-void bmesh_update_face_normal_vertex_cos(BMesh *bm, BMFace *f, float no[3],
+/* exact same as 'bmesh_face_normal_update' but accepts vertex coords */
+void bmesh_face_normal_update_vertex_cos(BMesh *bm, BMFace *f, float no[3],
                                          float (*projectverts)[3], float (*vertexCos)[3])
 {
 	BMLoop *l;
@@ -840,7 +840,7 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, float (*projectverts)[3],
 
 	bm->elem_index_dirty |= BM_VERT; /* see above */
 
-	///bmesh_update_face_normal(bm, f, f->no, projectverts);
+	///bmesh_face_normal_update(bm, f, f->no, projectverts);
 
 	compute_poly_normal(f->no, projectverts, f->len);
 	poly_rotate_plane(f->no, projectverts, i);
diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h
index c6237743541..730078a5f4d 100644
--- a/source/blender/bmesh/intern/bmesh_private.h
+++ b/source/blender/bmesh/intern/bmesh_private.h
@@ -40,13 +40,13 @@ struct Link;
 struct BMLoop;
 
 /* returns positive nonzero on error */
-int bmesh_check_element(BMesh *bm, void *element, const char htype);
+int bmesh_element_check(BMesh *bm, void *element, const char htype);
 
 #define BM_CHECK_ELEMENT(bm, el)                                              \
-    if (bmesh_check_element(bm, el, ((BMHeader *)el)->htype)) {               \
+    if (bmesh_element_check(bm, el, ((BMHeader *)el)->htype)) {               \
         printf("check_element failure, with code %i on line %i in file\n"     \
         "    \"%s\"\n\n",                                                     \
-        bmesh_check_element(bm, el, ((BMHeader *)el)->htype),                 \
+        bmesh_element_check(bm, el, ((BMHeader *)el)->htype),                 \
         __LINE__, __FILE__);                                                  \
     }
 
@@ -79,9 +79,9 @@ int bmesh_get_filter_argtype(int type);
 /* newedgeflag sets a flag layer flag, obviously not the header flag. */
 void BM_face_triangulate(BMesh *bm, BMFace *f, float (*projectverts)[3],
                          const short newedge_oflag, const short newface_oflag, BMFace **newfaces);
-void bmesh_update_face_normal(struct BMesh *bm, struct BMFace *f, float no[3],
+void bmesh_face_normal_update(struct BMesh *bm, struct BMFace *f, float no[3],
                               float (*projectverts)[3]);
-void bmesh_update_face_normal_vertex_cos(struct BMesh *bm, struct BMFace *f, float no[3],
+void bmesh_face_normal_update_vertex_cos(struct BMesh *bm, struct BMFace *f, float no[3],
                                          float (*projectverts)[3], float (*vertexCos)[3]);
 
 void compute_poly_plane(float (*verts)[3], int nverts);
diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c
index 0c1f0454dc5..2db74ea0ea4 100644
--- a/source/blender/bmesh/tools/BME_bevel.c
+++ b/source/blender/bmesh/tools/BME_bevel.c
@@ -1002,9 +1002,9 @@ BMesh *BME_bevel(BMEditMesh *em, float value, int res, int options, int defgrp_i
 		BMO_push(bm, NULL);
 		BME_bevel_initialize(bm, options, defgrp_index, angle, td);
 		//if (i != 0) BME_bevel_reinitialize(bm);
-		bmesh_begin_edit(bm, 0);
+		bmesh_edit_begin(bm, 0);
 		BME_bevel_mesh(bm, (float)d, res, options, defgrp_index, td);
-		bmesh_end_edit(bm, 0);
+		bmesh_edit_end(bm, 0);
 		d /= (i == 0) ? 3.0 : 2.0;
 		BMO_pop(bm);
 	}
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c
index 36ffacef1ab..7dd34c907b1 100644
--- a/source/blender/editors/mesh/bmesh_tools.c
+++ b/source/blender/editors/mesh/bmesh_tools.c
@@ -95,11 +95,11 @@ static int subdivide_exec(bContext *C, wmOperator *op)
 	}
 	
 	BM_mesh_esubdivideflag(obedit, em->bm, BM_ELEM_SELECT,
-	                  smooth, fractal,
-	                  ts->editbutflag|flag, 
-	                  cuts, 0, RNA_enum_get(op->ptr, "quadcorner"), 
-	                  RNA_boolean_get(op->ptr, "quadtri"),
-	                  TRUE, RNA_int_get(op->ptr, "seed"));
+	                       smooth, fractal,
+	                       ts->editbutflag|flag,
+	                       cuts, 0, RNA_enum_get(op->ptr, "quadcorner"),
+	                       RNA_boolean_get(op->ptr, "quadtri"),
+	                       TRUE, RNA_int_get(op->ptr, "seed"));
 
 	DAG_id_tag_update(obedit->data, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c
index 3214ed9ec4b..3a9494f506d 100644
--- a/source/blender/editors/mesh/knifetool.c
+++ b/source/blender/editors/mesh/knifetool.c
@@ -1706,7 +1706,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
 	int i, j, k = 0, totface = bm->totface;
 	
 	BMO_push(bm, NULL);
-	bmesh_begin_edit(bm, BMO_OP_FLAG_UNTAN_MULTIRES);
+	bmesh_edit_begin(bm, BMO_OP_FLAG_UNTAN_MULTIRES);
 
 	/* BMESH_TODO this should be valid now, leaving here until we can ensure this - campbell */
 	i = 0;
@@ -1939,7 +1939,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd)
 	
 	BMO_error_clear(bm); /* remerge_faces sometimes raises errors, so make sure to clear them */
 
-	bmesh_end_edit(bm, BMO_OP_FLAG_UNTAN_MULTIRES);
+	bmesh_edit_end(bm, BMO_OP_FLAG_UNTAN_MULTIRES);
 	BMO_pop(bm);
 }
 
diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c
index 4be24e7f781..30dedf10618 100644
--- a/source/blender/editors/mesh/loopcut.c
+++ b/source/blender/editors/mesh/loopcut.c
@@ -308,9 +308,9 @@ static void ringsel_finish(bContext *C, wmOperator *op)
 		edgering_sel(lcd, cuts, 1);
 		
 		if (lcd->do_cut) {
-			BM_mesh_esubdivideflag(lcd->ob, em->bm, BM_ELEM_SELECT, 0.0f, 
-			                  0.0f, 0, cuts, SUBDIV_SELECT_LOOPCUT, 
-			                  SUBD_PATH, 0, FALSE, 0);
+			BM_mesh_esubdivideflag(lcd->ob, em->bm, BM_ELEM_SELECT, 0.0f,
+			                       0.0f, 0, cuts, SUBDIV_SELECT_LOOPCUT,
+			                       SUBD_PATH, 0, FALSE, 0);
 			
 			/* force edge slide to edge select mode in in face select mode */
 			if (em->selectmode & SCE_SELECT_FACE) {
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 18df770a873..9b971376846 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -4601,7 +4601,7 @@ static int createSlideVerts(TransInfo *t)
 	}
 	
 	em->bm->ob = t->obedit;
-	bmesh_begin_edit(em->bm, BMO_OP_FLAG_UNTAN_MULTIRES);
+	bmesh_edit_begin(em->bm, BMO_OP_FLAG_UNTAN_MULTIRES);
 
 	/*create copies of faces for customdata projection*/
 	tempsv = sld->sv;
@@ -4783,7 +4783,7 @@ void freeSlideVerts(TransInfo *t)
 	}
 	
 	sld->em->bm->ob = t->obedit;
-	bmesh_end_edit(sld->em->bm, BMO_OP_FLAG_UNTAN_MULTIRES);
+	bmesh_edit_end(sld->em->bm, BMO_OP_FLAG_UNTAN_MULTIRES);
 
 	BLI_smallhash_release(&sld->vhash);
 	BLI_smallhash_release(&sld->origfaces);
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 63871152af8..1ae25dd699e 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -288,7 +288,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 	   certainly help by compressing it all into one top-level BMOp that
 	   executes a lot of second-level BMOps. */
 	BMO_push(em->bm, NULL);
-	bmesh_begin_edit(em->bm, 0);
+	bmesh_edit_begin(em->bm, 0);
 
 	BMO_op_init(em->bm, &weldop, "weldverts");
 	BMO_op_initf(em->bm, &op, "dupe geom=%avef");