3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index b7ebee49c48..2d6d004a318 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -391,7 +391,7 @@ void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C)
 	uiBlockSetHandleFunc(block, do_view3d_header_buttons, NULL);
 
 	if (obedit && (obedit->type == OB_MESH)) {
-		BMEditMesh *em = BMEdit_FromObject(obedit);
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 		uiLayout *row;
 
 		row = uiLayoutRow(layout, TRUE);
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index a2529332f93..efafae5cb55 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -482,7 +482,7 @@ static void do_lasso_select_mesh(ViewContext *vc, const int mcords[][2], short m
 	int bbsel;
 	
 	/* set editmesh */
-	vc->em = BMEdit_FromObject(vc->obedit);
+	vc->em = BKE_editmesh_from_object(vc->obedit);
 
 	BLI_lasso_boundbox(&rect, mcords, moves);
 
@@ -2077,7 +2077,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 	if (vc.obedit) {
 		switch (vc.obedit->type) {
 			case OB_MESH:
-				vc.em = BMEdit_FromObject(vc.obedit);
+				vc.em = BKE_editmesh_from_object(vc.obedit);
 				ret = do_mesh_box_select(&vc, &rect, select, extend);
 //			if (EM_texFaceCheck())
 				if (ret & OPERATOR_FINISHED) {
@@ -2339,7 +2339,7 @@ static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], f
 	bbsel = EDBM_backbuf_circle_init(vc, mval[0], mval[1], (short)(rad + 1.0f));
 	ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
 
-	vc->em = BMEdit_FromObject(vc->obedit);
+	vc->em = BKE_editmesh_from_object(vc->obedit);
 
 	view3d_userdata_circleselect_init(&data, vc, select, mval, rad);
 
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index 39d00badfaf..3458aa48833 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -100,7 +100,7 @@ static void special_transvert_update(Object *obedit)
 		DAG_id_tag_update(obedit->data, 0);
 		
 		if (obedit->type == OB_MESH) {
-			BMEditMesh *em = BMEdit_FromObject(obedit);
+			BMEditMesh *em = BKE_editmesh_from_object(obedit);
 			BM_mesh_normals_update(em->bm, true);  /* does face centers too */
 		}
 		else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
@@ -251,7 +251,7 @@ static void make_trans_verts(Object *obedit, float min[3], float max[3], int mod
 	zero_v3(centroid);
 	
 	if (obedit->type == OB_MESH) {
-		BMEditMesh *em = BMEdit_FromObject(obedit);
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 		BMesh *bm = em->bm;
 		BMIter iter;
 		void *userdata[2] = {em, NULL};
@@ -1005,7 +1005,7 @@ static int snap_curs_to_active(bContext *C, wmOperator *UNUSED(op))
 
 	if (obedit) {
 		if (obedit->type == OB_MESH) {
-			BMEditMesh *em = BMEdit_FromObject(obedit);
+			BMEditMesh *em = BKE_editmesh_from_object(obedit);
 			/* check active */
 			BMEditSelection ese;