Cleanup: rename Mesh.edit_btmesh -> edit_mesh

When bmesh was in a branch we had both edit_mesh and edit_btmesh,
now there is no reason to use this odd name.

13 files changed, 51 insertions, 51 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index d31fb72e4a0..51d9763a01e 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1909,11 +1909,11 @@ static void editbmesh_calc_modifiers(
 	 * check if the derived meshes are DM_TYPE_EDITBMESH before calling, this isn't essential
 	 * but quiets annoying error messages since tessfaces wont be created. */
 	if (dataMask & CD_MASK_MFACE) {
-		if ((*r_final)->edit_btmesh == NULL) {
+		if ((*r_final)->edit_mesh == NULL) {
 			BKE_mesh_tessface_ensure(*r_final);
 		}
 		if (r_cage && *r_cage) {
-			if ((*r_cage)->edit_btmesh == NULL) {
+			if ((*r_cage)->edit_mesh == NULL) {
 				if (*r_cage != *r_final) {
 					BKE_mesh_tessface_ensure(*r_cage);
 				}
@@ -1971,7 +1971,7 @@ static void mesh_finalize_eval(Object *object)
 	/* Make evaluated mesh to share same edit mesh pointer as original
 	 * and copied meshes.
 	 */
-	mesh_eval->edit_btmesh = mesh->edit_btmesh;
+	mesh_eval->edit_mesh = mesh->edit_mesh;
 	/* Copy autosmooth settings from original mesh.
 	 * This is not done by BKE_mesh_new_nomain_from_template(), so need to take
 	 * extra care here.
diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c
index 5ed9e15d17b..e0a4744d5f0 100644
--- a/source/blender/blenkernel/intern/crazyspace.c
+++ b/source/blender/blenkernel/intern/crazyspace.c
@@ -99,18 +99,18 @@ float (*BKE_crazyspace_get_mapped_editverts(
 	Mesh *me = obedit->data;
 	Mesh *me_eval;
 	float (*vertexcos)[3];
-	int nverts = me->edit_btmesh->bm->totvert;
+	int nverts = me->edit_mesh->bm->totvert;
 
 	/* disable subsurf temporal, get mapped cos, and enable it */
 	if (modifiers_disable_subsurf_temporary(obedit)) {
 		/* need to make new derivemesh */
-		makeDerivedMesh(depsgraph, scene, obedit, me->edit_btmesh, CD_MASK_BAREMESH, false);
+		makeDerivedMesh(depsgraph, scene, obedit, me->edit_mesh, CD_MASK_BAREMESH, false);
 	}
 
 	/* now get the cage */
 	vertexcos = MEM_mallocN(sizeof(*vertexcos) * nverts, "vertexcos map");
 
-	me_eval = editbmesh_get_eval_cage_from_orig(depsgraph, scene, obedit, me->edit_btmesh, CD_MASK_BAREMESH);
+	me_eval = editbmesh_get_eval_cage_from_orig(depsgraph, scene, obedit, me->edit_mesh, CD_MASK_BAREMESH);
 
 	mesh_get_mapped_verts_coords(me_eval, vertexcos, nverts);
 
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c
index 992d24b4884..9a80870e489 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -83,12 +83,12 @@ BMEditMesh *BKE_editmesh_from_object(Object *ob)
 	/* sanity check */
 #if 0 /* disable in mutlti-object edit. */
 #ifndef NDEBUG
-	if (((Mesh *)ob->data)->edit_btmesh) {
-		BLI_assert(((Mesh *)ob->data)->edit_btmesh->ob == ob);
+	if (((Mesh *)ob->data)->edit_mesh) {
+		BLI_assert(((Mesh *)ob->data)->edit_mesh->ob == ob);
 	}
 #endif
 #endif
-	return ((Mesh *)ob->data)->edit_btmesh;
+	return ((Mesh *)ob->data)->edit_mesh;
 }
 
 
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index f5f9f6d0eba..8f52dfe2e8b 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -514,11 +514,11 @@ static char *key_block_get_data(Key *key, KeyBlock *actkb, KeyBlock *kb, char **
 
 			me = (Mesh *)key->from;
 
-			if (me->edit_btmesh && me->edit_btmesh->bm->totvert == kb->totelem) {
+			if (me->edit_mesh && me->edit_mesh->bm->totvert == kb->totelem) {
 				a = 0;
-				co = MEM_mallocN(sizeof(float) * 3 * me->edit_btmesh->bm->totvert, "key_block_get_data");
+				co = MEM_mallocN(sizeof(float) * 3 * me->edit_mesh->bm->totvert, "key_block_get_data");
 
-				BM_ITER_MESH (eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH) {
+				BM_ITER_MESH (eve, &iter, me->edit_mesh->bm, BM_VERTS_OF_MESH) {
 					copy_v3_v3(co[a], eve->co);
 					a++;
 				}
@@ -1052,8 +1052,8 @@ static float *get_weights_array(Object *ob, char *vgroup, WeightsArrayCache *cac
 		dvert = me->dvert;
 		totvert = me->totvert;
 
-		if (me->edit_btmesh && me->edit_btmesh->bm->totvert == totvert)
-			em = me->edit_btmesh;
+		if (me->edit_mesh && me->edit_mesh->bm->totvert == totvert)
+			em = me->edit_mesh;
 	}
 	else if (ob->type == OB_LATTICE) {
 		Lattice *lt = ob->data;
diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c
index dc9b749243a..bdebacb745b 100644
--- a/source/blender/blenkernel/intern/layer_utils.c
+++ b/source/blender/blenkernel/intern/layer_utils.c
@@ -96,7 +96,7 @@ bool BKE_view_layer_filter_edit_mesh_has_uvs(Object *ob, void *UNUSED(user_data)
 {
 	if (ob->type == OB_MESH) {
 		Mesh *me = ob->data;
-		BMEditMesh *em = me->edit_btmesh;
+		BMEditMesh *em = me->edit_mesh;
 		if (em != NULL) {
 			if (CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV) != -1) {
 				return true;
@@ -110,7 +110,7 @@ bool BKE_view_layer_filter_edit_mesh_has_edges(Object *ob, void *UNUSED(user_dat
 {
 	if (ob->type == OB_MESH) {
 		Mesh *me = ob->data;
-		BMEditMesh *em = me->edit_btmesh;
+		BMEditMesh *em = me->edit_mesh;
 		if (em != NULL) {
 			if (em->bm->totedge != 0) {
 				return true;
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 780712c8e25..118a14eecb3 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -330,7 +330,7 @@ static void mesh_ensure_tessellation_customdata(Mesh *me)
 
 void BKE_mesh_ensure_skin_customdata(Mesh *me)
 {
-	BMesh *bm = me->edit_btmesh ? me->edit_btmesh->bm : NULL;
+	BMesh *bm = me->edit_mesh ? me->edit_mesh->bm : NULL;
 	MVertSkin *vs;
 
 	if (bm) {
@@ -369,7 +369,7 @@ void BKE_mesh_ensure_skin_customdata(Mesh *me)
 
 bool BKE_mesh_ensure_facemap_customdata(struct Mesh *me)
 {
-	BMesh *bm = me->edit_btmesh ? me->edit_btmesh->bm : NULL;
+	BMesh *bm = me->edit_mesh ? me->edit_mesh->bm : NULL;
 	bool changed = false;
 	if (bm) {
 		if (!CustomData_has_layer(&bm->pdata, CD_FACEMAP)) {
@@ -393,7 +393,7 @@ bool BKE_mesh_ensure_facemap_customdata(struct Mesh *me)
 
 bool BKE_mesh_clear_facemap_customdata(struct Mesh *me)
 {
-	BMesh *bm = me->edit_btmesh ? me->edit_btmesh->bm : NULL;
+	BMesh *bm = me->edit_mesh ? me->edit_mesh->bm : NULL;
 	bool changed = false;
 	if (bm) {
 		if (CustomData_has_layer(&bm->pdata, CD_FACEMAP)) {
@@ -447,8 +447,8 @@ void BKE_mesh_update_customdata_pointers(Mesh *me, const bool do_ensure_tess_cd)
 
 bool BKE_mesh_has_custom_loop_normals(Mesh *me)
 {
-	if (me->edit_btmesh) {
-		return CustomData_has_layer(&me->edit_btmesh->bm->ldata, CD_CUSTOMLOOPNORMAL);
+	if (me->edit_mesh) {
+		return CustomData_has_layer(&me->edit_mesh->bm->ldata, CD_CUSTOMLOOPNORMAL);
 	}
 	else {
 		return CustomData_has_layer(&me->ldata, CD_CUSTOMLOOPNORMAL);
@@ -471,7 +471,7 @@ void BKE_mesh_free(Mesh *me)
 	MEM_SAFE_FREE(me->mat);
 	MEM_SAFE_FREE(me->bb);
 	MEM_SAFE_FREE(me->mselect);
-	MEM_SAFE_FREE(me->edit_btmesh);
+	MEM_SAFE_FREE(me->edit_mesh);
 }
 
 static void mesh_tessface_clear_intern(Mesh *mesh, int free_customdata)
@@ -557,7 +557,7 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int
 
 	BKE_mesh_update_customdata_pointers(me_dst, do_tessface);
 
-	me_dst->edit_btmesh = NULL;
+	me_dst->edit_mesh = NULL;
 
 	me_dst->mselect = MEM_dupallocN(me_dst->mselect);
 	me_dst->bb = MEM_dupallocN(me_dst->bb);
@@ -772,8 +772,8 @@ bool BKE_mesh_uv_cdlayer_rename_index(
 	CustomData *ldata, *fdata;
 	CustomDataLayer *cdlu, *cdlf;
 
-	if (me->edit_btmesh) {
-		ldata = &me->edit_btmesh->bm->ldata;
+	if (me->edit_mesh) {
+		ldata = &me->edit_mesh->bm->ldata;
 		fdata = NULL;  /* No tessellated data in BMesh! */
 	}
 	else {
@@ -805,8 +805,8 @@ bool BKE_mesh_uv_cdlayer_rename_index(
 bool BKE_mesh_uv_cdlayer_rename(Mesh *me, const char *old_name, const char *new_name, bool do_tessface)
 {
 	CustomData *ldata, *fdata;
-	if (me->edit_btmesh) {
-		ldata = &me->edit_btmesh->bm->ldata;
+	if (me->edit_mesh) {
+		ldata = &me->edit_mesh->bm->ldata;
 		/* No tessellated data in BMesh! */
 		fdata = NULL;
 		do_tessface = false;
@@ -1145,8 +1145,8 @@ void BKE_mesh_material_remap(Mesh *me, const unsigned int *remap, unsigned int r
 		n = remap[n]; \
 	} ((void)0)
 
-	if (me->edit_btmesh) {
-		BMEditMesh *em = me->edit_btmesh;
+	if (me->edit_mesh) {
+		BMEditMesh *em = me->edit_mesh;
 		BMIter iter;
 		BMFace *efa;
 
@@ -1547,8 +1547,8 @@ void BKE_mesh_mselect_active_set(Mesh *me, int index, int type)
 void BKE_mesh_count_selected_items(const Mesh *mesh, int r_count[3])
 {
 	r_count[0] = r_count[1] = r_count[2] = 0;
-	if (mesh->edit_btmesh) {
-		BMesh *bm = mesh->edit_btmesh->bm;
+	if (mesh->edit_mesh) {
+		BMesh *bm = mesh->edit_mesh->bm;
 		r_count[0] = bm->totvertsel;
 		r_count[1] = bm->totedgesel;
 		r_count[2] = bm->totfacesel;
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index cdb18073739..1d1999713dd 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -79,8 +79,8 @@ static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm
 
 void multires_customdata_delete(Mesh *me)
 {
-	if (me->edit_btmesh) {
-		BMEditMesh *em = me->edit_btmesh;
+	if (me->edit_mesh) {
+		BMEditMesh *em = me->edit_mesh;
 		/* CustomData_external_remove is used here only to mark layer
 		 * as non-external for further free-ing, so zero element count
 		 * looks safer than em->totface */
@@ -469,8 +469,8 @@ void multiresModifier_set_levels_from_disps(MultiresModifierData *mmd, Object *o
 	Mesh *me = ob->data;
 	MDisps *mdisp;
 
-	if (me->edit_btmesh)
-		mdisp = CustomData_get_layer(&me->edit_btmesh->bm->ldata, CD_MDISPS);
+	if (me->edit_mesh)
+		mdisp = CustomData_get_layer(&me->edit_mesh->bm->ldata, CD_MDISPS);
 	else
 		mdisp = CustomData_get_layer(&me->ldata, CD_MDISPS);
 
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 8a50a93487a..a2bf36bc660 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -465,7 +465,7 @@ void BKE_object_free_derived_caches(Object *ob)
 			ob->data = ob->runtime.mesh_orig;
 		}
 		/* Evaluated mesh points to edit mesh, but does not own it. */
-		mesh_eval->edit_btmesh = NULL;
+		mesh_eval->edit_mesh = NULL;
 		BKE_mesh_free(mesh_eval);
 		BKE_libblock_free_data(&mesh_eval->id, false);
 		MEM_freeN(mesh_eval);
@@ -613,7 +613,7 @@ bool BKE_object_is_in_editmode(const Object *ob)
 
 	switch (ob->type) {
 		case OB_MESH:
-			return ((Mesh *)ob->data)->edit_btmesh != NULL;
+			return ((Mesh *)ob->data)->edit_mesh != NULL;
 		case OB_ARMATURE:
 			return ((bArmature *)ob->data)->edbo != NULL;
 		case OB_FONT:
@@ -642,7 +642,7 @@ bool BKE_object_data_is_in_editmode(const ID *id)
 	BLI_assert(OB_DATA_SUPPORT_EDITMODE(type));
 	switch (type) {
 		case ID_ME:
-			return ((const Mesh *)id)->edit_btmesh != NULL;
+			return ((const Mesh *)id)->edit_mesh != NULL;
 		case ID_CU:
 			return (
 			        (((const Curve *)id)->editnurb != NULL) ||
@@ -665,7 +665,7 @@ bool BKE_object_is_in_wpaint_select_vert(const Object *ob)
 	if (ob->type == OB_MESH) {
 		Mesh *me = ob->data;
 		return ((ob->mode & OB_MODE_WEIGHT_PAINT) &&
-		        (me->edit_btmesh == NULL) &&
+		        (me->edit_mesh == NULL) &&
 		        (ME_EDIT_PAINT_SEL_MODE(me) == SCE_SELECT_VERTEX));
 	}
 
@@ -2001,7 +2001,7 @@ static void give_parvert(Object *par, int nr, float vec[3])
 
 	if (par->type == OB_MESH) {
 		Mesh *me = par->data;
-		BMEditMesh *em = me->edit_btmesh;
+		BMEditMesh *em = me->edit_mesh;
 		Mesh *me_eval = (em) ? em->mesh_eval_final : par->runtime.mesh_eval;
 
 		if (me_eval) {
diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c
index e52d1000fe3..71262d276e8 100644
--- a/source/blender/blenkernel/intern/object_deform.c
+++ b/source/blender/blenkernel/intern/object_deform.c
@@ -173,8 +173,8 @@ bool BKE_object_defgroup_clear(Object *ob, bDeformGroup *dg, const bool use_sele
 	if (ob->type == OB_MESH) {
 		Mesh *me = ob->data;
 
-		if (me->edit_btmesh) {
-			BMEditMesh *em = me->edit_btmesh;
+		if (me->edit_mesh) {
+			BMEditMesh *em = me->edit_mesh;
 			const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT);
 
 			if (cd_dvert_offset != -1) {
@@ -353,7 +353,7 @@ static void object_defgroup_remove_edit_mode(Object *ob, bDeformGroup *dg)
 	/* Else, make sure that any groups with higher indices are adjusted accordingly */
 	else if (ob->type == OB_MESH) {
 		Mesh *me = ob->data;
-		BMEditMesh *em = me->edit_btmesh;
+		BMEditMesh *em = me->edit_mesh;
 		const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT);
 
 		BMIter iter;
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 22402a6a206..db6855ccaf3 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -305,7 +305,7 @@ static const DupliGenerator gen_dupli_collection = {
 /* OB_DUPLIVERTS */
 typedef struct VertexDupliData {
 	Mesh *me_eval;
-	BMEditMesh *edit_btmesh;
+	BMEditMesh *edit_mesh;
 	int totvert;
 	float (*orco)[3];
 	bool use_rotation;
@@ -396,14 +396,14 @@ static void make_duplis_verts(const DupliContext *ctx)
 
 	/* gather mesh info */
 	{
-		vdd.edit_btmesh = BKE_editmesh_from_object(parent);
+		vdd.edit_mesh = BKE_editmesh_from_object(parent);
 
 		/* We do not need any render-specific handling anymore, depsgraph takes care of that. */
 		/* NOTE: Do direct access to the evaluated mesh: this function is used
 		 * during meta balls evaluation. But even without those all the objects
 		 * which are needed for correct instancing are already evaluated. */
-		if (vdd.edit_btmesh != NULL) {
-			vdd.me_eval = vdd.edit_btmesh->mesh_eval_cage;
+		if (vdd.edit_mesh != NULL) {
+			vdd.me_eval = vdd.edit_mesh->mesh_eval_cage;
 		}
 		else {
 			vdd.me_eval = parent->runtime.mesh_eval;
diff --git a/source/blender/blenkernel/intern/object_facemap.c b/source/blender/blenkernel/intern/object_facemap.c
index f5aa737afdf..290793d2776 100644
--- a/source/blender/blenkernel/intern/object_facemap.c
+++ b/source/blender/blenkernel/intern/object_facemap.c
@@ -132,8 +132,8 @@ static void object_fmap_remove_edit_mode(Object *ob, bFaceMap *fmap, bool do_sel
 	if (ob->type == OB_MESH) {
 		Mesh *me = ob->data;
 
-		if (me->edit_btmesh) {
-			BMEditMesh *em = me->edit_btmesh;
+		if (me->edit_mesh) {
+			BMEditMesh *em = me->edit_mesh;
 			const int cd_fmap_offset = CustomData_get_offset(&em->bm->pdata, CD_FACEMAP);
 
 			if (cd_fmap_offset != -1) {
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 78c1ca6419b..f41789f6a1d 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -162,7 +162,7 @@ void BKE_object_handle_data_update(
 #if 0
 			BMEditMesh *em = (ob->mode & OB_MODE_EDIT) ? BKE_editmesh_from_object(ob) : NULL;
 #else
-			BMEditMesh *em = (ob->mode & OB_MODE_EDIT) ? ((Mesh *)ob->data)->edit_btmesh : NULL;
+			BMEditMesh *em = (ob->mode & OB_MODE_EDIT) ? ((Mesh *)ob->data)->edit_mesh : NULL;
 			if (em && em->ob != ob) {
 				em = NULL;
 			}
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 18e2135f947..7c978458ef1 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1453,7 +1453,7 @@ static void prepare_mesh_for_viewport_render(
 		     (mesh->id.recalc & ID_RECALC_ALL)))
 		{
 			if (check_rendered_viewport_visible(bmain)) {
-				BMesh *bm = mesh->edit_btmesh->bm;
+				BMesh *bm = mesh->edit_mesh->bm;
 				BM_mesh_bm_to_me(
 				        bmain, bm, mesh,
 				        (&(struct BMeshToMeshParams){