code cleanup: use BKE naming conventions for functions in BKE_editmesh.h and BKE_editmesh_bvh.h

5 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index a3f7e0f23d9..55b1da38b5c 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -476,11 +476,11 @@ void ED_object_editmode_enter(bContext *C, int flag)
 
 		EDBM_mesh_make(CTX_data_tool_settings(C), scene, ob);
 
-		em = BMEdit_FromObject(ob);
+		em = BKE_editmesh_from_object(ob);
 		if (LIKELY(em)) {
 			/* order doesn't matter */
 			EDBM_mesh_normals_update(em);
-			BMEdit_RecalcTessellation(em);
+			BKE_editmesh_tessface_calc(em);
 
 			BM_mesh_select_mode_flush(em->bm);
 		}
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index f0ab55e1e0f..e3a679e8bc3 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -315,7 +315,7 @@ static int object_hook_index_array(Scene *scene, Object *obedit, int *tot, int *
 			em = me->edit_btmesh;
 
 			EDBM_mesh_normals_update(em);
-			BMEdit_RecalcTessellation(em);
+			BKE_editmesh_tessface_calc(em);
 
 			/* check selected vertices first */
 			if (return_editmesh_indexar(em, tot, indexar, cent_r)) {
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 9e49cc64c6c..e89c581a7b6 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1518,7 +1518,7 @@ static void skin_root_clear(BMesh *bm, BMVert *bm_vert, GHash *visited)
 static int skin_root_mark_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = CTX_data_edit_object(C);
-	BMEditMesh *em = BMEdit_FromObject(ob);
+	BMEditMesh *em = BKE_editmesh_from_object(ob);
 	BMesh *bm = em->bm;
 	BMVert *bm_vert;
 	BMIter bm_iter;
@@ -1574,7 +1574,7 @@ typedef enum {
 static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op)
 {
 	Object *ob = CTX_data_edit_object(C);
-	BMEditMesh *em = BMEdit_FromObject(ob);
+	BMEditMesh *em = BKE_editmesh_from_object(ob);
 	BMesh *bm = em->bm;
 	BMVert *bm_vert;
 	BMIter bm_iter;
@@ -1632,7 +1632,7 @@ void OBJECT_OT_skin_loose_mark_clear(wmOperatorType *ot)
 static int skin_radii_equalize_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = CTX_data_edit_object(C);
-	BMEditMesh *em = BMEdit_FromObject(ob);
+	BMEditMesh *em = BKE_editmesh_from_object(ob);
 	BMesh *bm = em->bm;
 	BMVert *bm_vert;
 	BMIter bm_iter;
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 48ef663592a..9ed57adf207 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -140,7 +140,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
 		em = me->edit_btmesh;
 
 		EDBM_mesh_normals_update(em);
-		BMEdit_RecalcTessellation(em);
+		BKE_editmesh_tessface_calc(em);
 
 		/* derivedMesh might be needed for solving parenting,
 		 * so re-create it here */
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 487a8ad4bc0..38a26447cb0 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -109,7 +109,7 @@ static Lattice *vgroup_edit_lattice(Object *ob)
 bool ED_vgroup_object_is_edit_mode(Object *ob)
 {
 	if (ob->type == OB_MESH)
-		return (BMEdit_FromObject(ob) != NULL);
+		return (BKE_editmesh_from_object(ob) != NULL);
 	else if (ob->type == OB_LATTICE)
 		return (((Lattice *)ob->data)->editlatt != NULL);
 
@@ -1662,7 +1662,7 @@ static void vgroup_blend(Object *ob, const float fac)
 	if (BLI_findlink(&ob->defbase, def_nr)) {
 		const float ifac = 1.0f - fac;
 
-		BMEditMesh *em = BMEdit_FromObject(ob);
+		BMEditMesh *em = BKE_editmesh_from_object(ob);
 		BMesh *bm = em ? em->bm : NULL;
 		Mesh  *me = em ? NULL   : ob->data;
 
@@ -2446,7 +2446,7 @@ static void vgroup_delete_edit_mode(Object *ob, bDeformGroup *dg)
 static bool vgroup_object_in_edit_mode(Object *ob)
 {
 	if (ob->type == OB_MESH)
-		return (BMEdit_FromObject(ob) != NULL);
+		return (BKE_editmesh_from_object(ob) != NULL);
 	else if (ob->type == OB_LATTICE)
 		return (((Lattice *)ob->data)->editlatt != NULL);
 	
@@ -3502,7 +3502,7 @@ static int vgroup_do_remap(Object *ob, const char *name_array, wmOperator *op)
 
 	if (ob->mode == OB_MODE_EDIT) {
 		if (ob->type == OB_MESH) {
-			BMEditMesh *em = BMEdit_FromObject(ob);
+			BMEditMesh *em = BKE_editmesh_from_object(ob);
 			BMIter iter;
 			BMVert *eve;