as per discussion with ton, the editmesh accessors now live

in blenkernel.

3 files changed, 12 insertions, 12 deletions

diff --git a/source/blender/editors/space_image/image_header.c b/source/blender/editors/space_image/image_header.c
index 80ace5500b8..0319b18eed4 100644
--- a/source/blender/editors/space_image/image_header.c
+++ b/source/blender/editors/space_image/image_header.c
@@ -381,7 +381,7 @@ static void image_uvsmenu(bContext *C, uiMenuItem *head, void *arg_unused)
 static void image_menu_uvlayers(Object *obedit, char *menustr, int *active)
 {
 	Mesh *me= (Mesh*)obedit->data;
-	EditMesh *em= EM_GetEditMesh(me);
+	EditMesh *em= BKE_mesh_get_editmesh(me);
 	CustomDataLayer *layer;
 	int i, count = 0;
 
@@ -398,7 +398,7 @@ static void image_menu_uvlayers(Object *obedit, char *menustr, int *active)
 
 	*active= CustomData_get_active_layer(&em->fdata, CD_MTFACE);
 
-	EM_EndEditMesh(me, em);
+	BKE_mesh_end_editmesh(me, em);
 }
 
 static void do_image_buttons(bContext *C, void *arg, int event)
diff --git a/source/blender/editors/space_image/image_panels.c b/source/blender/editors/space_image/image_panels.c
index fa7e54eab99..5d387bffcf0 100644
--- a/source/blender/editors/space_image/image_panels.c
+++ b/source/blender/editors/space_image/image_panels.c
@@ -249,7 +249,7 @@ static void image_editvertex_buts(const bContext *C, uiBlock *block)
 	
 	image_transform_but_attr(sima, &imx, &imy, &step, &digits);
 	
-	em= EM_GetEditMesh((Mesh *)obedit->data);
+	em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 	for (efa= em->faces.first; efa; efa= efa->next) {
 		tf= CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
 		if (simaFaceDraw_Check(efa, tf)) {
@@ -339,7 +339,7 @@ static void image_editvertex_buts(const bContext *C, uiBlock *block)
 		WM_event_add_notifier(C, NC_IMAGE, sima->image);
 	}
 
-	EM_EndEditMesh(obedit->data, em);
+	BKE_mesh_end_editmesh(obedit->data, em);
 }
 
 
@@ -443,7 +443,7 @@ static void image_panel_view_properties(const bContext *C, ARegion *ar)
 	
 	if (obedit && obedit->type==OB_MESH) {
 		Mesh *me= obedit->data;
-		EditMesh *em= EM_GetEditMesh(me);
+		EditMesh *em= BKE_mesh_get_editmesh(me);
 		
 		if(EM_texFaceCheck(em)) {
 			uiDefBut(block, LABEL, B_NOP, "Draw Type:",		10, 80,120,19, 0, 0, 0, 0, 0, "");
@@ -472,7 +472,7 @@ static void image_panel_view_properties(const bContext *C, ARegion *ar)
 			}
 		}
 
-		EM_EndEditMesh(me, em);
+		BKE_mesh_end_editmesh(me, em);
 	}
 	image_editcursor_buts(C, &ar->v2d, block);
 }
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index db8bdbdacc8..77017979de7 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -255,7 +255,7 @@ static void image_refresh(const bContext *C, ScrArea *sa)
 	if(ima && (ima->source==IMA_SRC_VIEWER || sima->pin));
 	else if(obedit && obedit->type == OB_MESH) {
 		Mesh *me= (Mesh*)obedit->data;
-		EditMesh *em= EM_GetEditMesh(me);
+		EditMesh *em= BKE_mesh_get_editmesh(me);
 		MTFace *tf;
 		
 		if(em && EM_texFaceCheck(em)) {
@@ -279,7 +279,7 @@ static void image_refresh(const bContext *C, ScrArea *sa)
 			}
 		}
 
-		EM_EndEditMesh(obedit->data, em);
+		BKE_mesh_end_editmesh(obedit->data, em);
 	}
 }
 
@@ -758,12 +758,12 @@ int ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit)
 		return 0;
 
 	if(obedit && obedit->type == OB_MESH) {
-		EditMesh *em = EM_GetEditMesh(obedit->data);
+		EditMesh *em = BKE_mesh_get_editmesh(obedit->data);
 		int ret;
 	
 		ret = EM_texFaceCheck(em);
 
-		EM_EndEditMesh(obedit->data, em);
+		BKE_mesh_end_editmesh(obedit->data, em);
 		return ret;
 	}
 
@@ -777,12 +777,12 @@ int ED_space_image_show_uvshadow(SpaceImage *sima, Object *obedit)
 
 	if(ED_space_image_show_paint(sima))
 		if(obedit && obedit->type == OB_MESH) {
-			EditMesh *em = EM_GetEditMesh(obedit->data);
+			EditMesh *em = BKE_mesh_get_editmesh(obedit->data);
 			int ret;
 
 			ret = EM_texFaceCheck(em);
 
-			EM_EndEditMesh(obedit->data, em);
+			BKE_mesh_end_editmesh(obedit->data, em);
 			return ret;
 		}