From e0e6229176573484431d2bbf3ba0c2f849522789 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Feb 2019 18:05:18 +1100 Subject: 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. --- source/blender/editors/mesh/editmesh_path.c | 2 +- source/blender/editors/mesh/editmesh_tools.c | 8 ++-- source/blender/editors/mesh/editmesh_undo.c | 8 ++-- source/blender/editors/mesh/editmesh_utils.c | 20 ++++---- source/blender/editors/mesh/mesh_data.c | 56 +++++++++++----------- source/blender/editors/mesh/mesh_mirror.c | 16 +++---- source/blender/editors/mesh/meshtools.c | 4 +- source/blender/editors/object/object_edit.c | 10 ++-- source/blender/editors/object/object_facemap_ops.c | 10 ++-- source/blender/editors/object/object_hook.c | 4 +- source/blender/editors/object/object_modifier.c | 2 +- source/blender/editors/object/object_relations.c | 2 +- source/blender/editors/object/object_transform.c | 2 +- source/blender/editors/object/object_vgroup.c | 28 +++++------ source/blender/editors/space_view3d/drawobject.c | 2 +- .../blender/editors/space_view3d/view3d_buttons.c | 4 +- .../editors/transform/transform_snap_object.c | 4 +- source/blender/editors/util/ed_util.c | 8 ++-- source/blender/editors/uvedit/uvedit_draw.c | 2 +- source/blender/editors/uvedit/uvedit_ops.c | 4 +- 20 files changed, 98 insertions(+), 98 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index f989b97f5f0..4e2712af227 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -286,7 +286,7 @@ static void edgetag_set_cb(BMEdge *e, bool val, void *user_data_v) static void edgetag_ensure_cd_flag(Mesh *me, const char edge_mode) { - BMesh *bm = me->edit_btmesh->bm; + BMesh *bm = me->edit_mesh->bm; switch (edge_mode) { case EDGE_MODE_TAG_CREASE: diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 46f5d4e952e..ff240039b4a 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3067,7 +3067,7 @@ static int edbm_shape_propagate_to_all_exec(bContext *C, wmOperator *op) for (uint ob_index = 0; ob_index < objects_len; ob_index++) { Object *obedit = objects[ob_index]; Mesh *me = obedit->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; if (em->bm->totvertsel == 0) { continue; @@ -3128,7 +3128,7 @@ static int edbm_blend_from_shape_exec(bContext *C, wmOperator *op) Mesh *me_ref = obedit_ref->data; Key *key_ref = me_ref->key; KeyBlock *kb_ref = NULL; - BMEditMesh *em_ref = me_ref->edit_btmesh; + BMEditMesh *em_ref = me_ref->edit_mesh; BMVert *eve; BMIter iter; ViewLayer *view_layer = CTX_data_view_layer(C); @@ -3164,7 +3164,7 @@ static int edbm_blend_from_shape_exec(bContext *C, wmOperator *op) Mesh *me = obedit->data; Key *key = me->key; KeyBlock *kb = NULL; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; int shape; if (em->bm->totvertsel == 0) { @@ -3742,7 +3742,7 @@ static Base *mesh_separate_tagged(Main *bmain, Scene *scene, ViewLayer *view_lay BM_mesh_bm_to_me(bmain, bm_new, base_new->object->data, (&(struct BMeshToMeshParams){0})); BM_mesh_free(bm_new); - ((Mesh *)base_new->object->data)->edit_btmesh = NULL; + ((Mesh *)base_new->object->data)->edit_mesh = NULL; return base_new; } diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 5ed4395a740..a36a7302c24 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -661,7 +661,7 @@ static Object *editmesh_object_from_context(bContext *C) Object *obedit = CTX_data_edit_object(C); if (obedit && obedit->type == OB_MESH) { Mesh *me = obedit->data; - if (me->edit_btmesh != NULL) { + if (me->edit_mesh != NULL) { return obedit; } } @@ -713,7 +713,7 @@ static bool mesh_undosys_step_encode(struct bContext *C, struct Main *UNUSED(bma elem->obedit_ref.ptr = ob; Mesh *me = elem->obedit_ref.ptr->data; - undomesh_from_editmesh(&elem->data, me->edit_btmesh, me->key); + undomesh_from_editmesh(&elem->data, me->edit_mesh, me->key); us->step.data_size += elem->data.undo_size; } MEM_freeN(objects); @@ -733,13 +733,13 @@ static void mesh_undosys_step_decode(struct bContext *C, struct Main *UNUSED(bma MeshUndoStep_Elem *elem = &us->elems[i]; Object *obedit = elem->obedit_ref.ptr; Mesh *me = obedit->data; - if (me->edit_btmesh == NULL) { + if (me->edit_mesh == NULL) { /* Should never fail, may not crash but can give odd behavior. */ CLOG_ERROR(&LOG, "name='%s', failed to enter edit-mode for object '%s', undo state invalid", us_p->name, obedit->id.name); continue; } - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; undomesh_to_editmesh(&elem->data, em, obedit->data); DEG_id_tag_update(&obedit->id, ID_RECALC_GEOMETRY); } diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index a873331f2eb..aba298687a7 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -296,26 +296,26 @@ void EDBM_mesh_make(Object *ob, const int select_mode, const bool add_key_index) me, ob, add_key_index, &((struct BMeshCreateParams){.use_toolflags = true,})); - if (me->edit_btmesh) { + if (me->edit_mesh) { /* this happens when switching shape keys */ - EDBM_mesh_free(me->edit_btmesh); - MEM_freeN(me->edit_btmesh); + EDBM_mesh_free(me->edit_mesh); + MEM_freeN(me->edit_mesh); } /* currently executing operators re-tessellates, so we can avoid doing here * but at some point it may need to be added back. */ #if 0 - me->edit_btmesh = BKE_editmesh_create(bm, true); + me->edit_mesh = BKE_editmesh_create(bm, true); #else - me->edit_btmesh = BKE_editmesh_create(bm, false); + me->edit_mesh = BKE_editmesh_create(bm, false); #endif - me->edit_btmesh->selectmode = me->edit_btmesh->bm->selectmode = select_mode; - me->edit_btmesh->mat_nr = (ob->actcol > 0) ? ob->actcol - 1 : 0; - me->edit_btmesh->ob = ob; + me->edit_mesh->selectmode = me->edit_mesh->bm->selectmode = select_mode; + me->edit_mesh->mat_nr = (ob->actcol > 0) ? ob->actcol - 1 : 0; + me->edit_mesh->ob = ob; /* we need to flush selection because the mode may have changed from when last in editmode */ - EDBM_selectmode_flush(me->edit_btmesh); + EDBM_selectmode_flush(me->edit_mesh); } /** @@ -325,7 +325,7 @@ void EDBM_mesh_make(Object *ob, const int select_mode, const bool add_key_index) void EDBM_mesh_load(Main *bmain, Object *ob) { Mesh *me = ob->data; - BMesh *bm = me->edit_btmesh->bm; + BMesh *bm = me->edit_mesh->bm; /* Workaround for T42360, 'ob->shapenr' should be 1 in this case. * however this isn't synchronized between objects at the moment. */ diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 0bf43204da8..dff096d8a0f 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -57,7 +57,7 @@ static CustomData *mesh_customdata_get_type(Mesh *me, const char htype, int *r_tot) { CustomData *data; - BMesh *bm = (me->edit_btmesh) ? me->edit_btmesh->bm : NULL; + BMesh *bm = (me->edit_mesh) ? me->edit_mesh->bm : NULL; int tot; /* this */ @@ -113,7 +113,7 @@ static CustomData *mesh_customdata_get_type(Mesh *me, const char htype, int *r_t return data; } -#define GET_CD_DATA(me, data) ((me)->edit_btmesh ? &(me)->edit_btmesh->bm->data : &(me)->data) +#define GET_CD_DATA(me, data) ((me)->edit_mesh ? &(me)->edit_mesh->bm->data : &(me)->data) static void delete_customdata_layer(Mesh *me, CustomDataLayer *layer) { const int type = layer->type; @@ -125,8 +125,8 @@ static void delete_customdata_layer(Mesh *me, CustomDataLayer *layer) n = (layer - &data->layers[layer_index]); BLI_assert(n >= 0 && (n + layer_index) < data->totlayer); - if (me->edit_btmesh) { - BM_data_layer_free_n(me->edit_btmesh->bm, data, type, n); + if (me->edit_mesh) { + BM_data_layer_free_n(me->edit_mesh->bm, data, type, n); } else { CustomData_free_layer(data, type, tot, layer_index + n); @@ -204,7 +204,7 @@ static void mesh_uv_reset_mface(MPoly *mp, MLoopUV *mloopuv) /* without bContext, called in uvedit */ void ED_mesh_uv_loop_reset_ex(struct Mesh *me, const int layernum) { - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; if (em) { /* Collect BMesh UVs */ @@ -256,8 +256,8 @@ int ED_mesh_uv_texture_add(Mesh *me, const char *name, const bool active_set) bool is_init = false; - if (me->edit_btmesh) { - em = me->edit_btmesh; + if (me->edit_mesh) { + em = me->edit_mesh; layernum_dst = CustomData_number_of_layers(&em->bm->ldata, CD_MLOOPUV); if (layernum_dst >= MAX_MTFACE) @@ -315,8 +315,8 @@ void ED_mesh_uv_texture_ensure(struct Mesh *me, const char *name) BMEditMesh *em; int layernum_dst; - if (me->edit_btmesh) { - em = me->edit_btmesh; + if (me->edit_mesh) { + em = me->edit_mesh; layernum_dst = CustomData_number_of_layers(&em->bm->ldata, CD_MLOOPUV); if (layernum_dst == 0) @@ -381,8 +381,8 @@ int ED_mesh_color_add(Mesh *me, const char *name, const bool active_set) BMEditMesh *em; int layernum; - if (me->edit_btmesh) { - em = me->edit_btmesh; + if (me->edit_mesh) { + em = me->edit_mesh; layernum = CustomData_number_of_layers(&em->bm->ldata, CD_MLOOPCOL); if (layernum >= MAX_MCOL) { @@ -431,7 +431,7 @@ int ED_mesh_color_add(Mesh *me, const char *name, const bool active_set) bool ED_mesh_color_ensure(struct Mesh *me, const char *name) { - BLI_assert(me->edit_btmesh == NULL); + BLI_assert(me->edit_mesh == NULL); if (!me->mloopcol && me->totloop) { CustomData_add_layer_named(&me->ldata, CD_MLOOPCOL, CD_DEFAULT, NULL, me->totloop, name); @@ -625,8 +625,8 @@ static int mesh_customdata_clear_exec__internal(bContext *C, BLI_assert(CustomData_layertype_is_singleton(type) == true); if (CustomData_has_layer(data, type)) { - if (me->edit_btmesh) { - BM_data_layer_free(me->edit_btmesh->bm, data, type); + if (me->edit_mesh) { + BM_data_layer_free(me->edit_mesh->bm, data, type); } else { CustomData_free_layers(data, type, tot); @@ -783,13 +783,13 @@ static int mesh_customdata_custom_splitnormals_add_exec(bContext *C, wmOperator if (!BKE_mesh_has_custom_loop_normals(me)) { CustomData *data = GET_CD_DATA(me, ldata); - if (me->edit_btmesh) { + if (me->edit_mesh) { /* Tag edges as sharp according to smooth threshold if needed, to preserve autosmooth shading. */ if (me->flag & ME_AUTOSMOOTH) { - BM_edges_sharp_from_angle_set(me->edit_btmesh->bm, me->smoothresh); + BM_edges_sharp_from_angle_set(me->edit_mesh->bm, me->smoothresh); } - BM_data_layer_add(me->edit_btmesh->bm, data, CD_CUSTOMLOOPNORMAL); + BM_data_layer_add(me->edit_mesh->bm, data, CD_CUSTOMLOOPNORMAL); } else { /* Tag edges as sharp according to smooth threshold if needed, to preserve autosmooth shading. */ @@ -1088,7 +1088,7 @@ static void mesh_remove_faces(Mesh *mesh, int len) #if 0 void ED_mesh_geometry_add(Mesh *mesh, ReportList *reports, int verts, int edges, int faces) { - if (mesh->edit_btmesh) { + if (mesh->edit_mesh) { BKE_report(reports, RPT_ERROR, "Cannot add geometry in edit mode"); return; } @@ -1104,7 +1104,7 @@ void ED_mesh_geometry_add(Mesh *mesh, ReportList *reports, int verts, int edges, void ED_mesh_tessfaces_add(Mesh *mesh, ReportList *reports, int count) { - if (mesh->edit_btmesh) { + if (mesh->edit_mesh) { BKE_report(reports, RPT_ERROR, "Cannot add tessfaces in edit mode"); return; } @@ -1119,7 +1119,7 @@ void ED_mesh_tessfaces_add(Mesh *mesh, ReportList *reports, int count) void ED_mesh_edges_add(Mesh *mesh, ReportList *reports, int count) { - if (mesh->edit_btmesh) { + if (mesh->edit_mesh) { BKE_report(reports, RPT_ERROR, "Cannot add edges in edit mode"); return; } @@ -1129,7 +1129,7 @@ void ED_mesh_edges_add(Mesh *mesh, ReportList *reports, int count) void ED_mesh_vertices_add(Mesh *mesh, ReportList *reports, int count) { - if (mesh->edit_btmesh) { + if (mesh->edit_mesh) { BKE_report(reports, RPT_ERROR, "Cannot add vertices in edit mode"); return; } @@ -1139,7 +1139,7 @@ void ED_mesh_vertices_add(Mesh *mesh, ReportList *reports, int count) void ED_mesh_faces_remove(Mesh *mesh, ReportList *reports, int count) { - if (mesh->edit_btmesh) { + if (mesh->edit_mesh) { BKE_report(reports, RPT_ERROR, "Cannot remove faces in edit mode"); return; } @@ -1153,7 +1153,7 @@ void ED_mesh_faces_remove(Mesh *mesh, ReportList *reports, int count) void ED_mesh_edges_remove(Mesh *mesh, ReportList *reports, int count) { - if (mesh->edit_btmesh) { + if (mesh->edit_mesh) { BKE_report(reports, RPT_ERROR, "Cannot remove edges in edit mode"); return; } @@ -1167,7 +1167,7 @@ void ED_mesh_edges_remove(Mesh *mesh, ReportList *reports, int count) void ED_mesh_vertices_remove(Mesh *mesh, ReportList *reports, int count) { - if (mesh->edit_btmesh) { + if (mesh->edit_mesh) { BKE_report(reports, RPT_ERROR, "Cannot remove vertices in edit mode"); return; } @@ -1181,7 +1181,7 @@ void ED_mesh_vertices_remove(Mesh *mesh, ReportList *reports, int count) void ED_mesh_loops_add(Mesh *mesh, ReportList *reports, int count) { - if (mesh->edit_btmesh) { + if (mesh->edit_mesh) { BKE_report(reports, RPT_ERROR, "Cannot add loops in edit mode"); return; } @@ -1191,7 +1191,7 @@ void ED_mesh_loops_add(Mesh *mesh, ReportList *reports, int count) void ED_mesh_polys_add(Mesh *mesh, ReportList *reports, int count) { - if (mesh->edit_btmesh) { + if (mesh->edit_mesh) { BKE_report(reports, RPT_ERROR, "Cannot add polygons in edit mode"); return; } @@ -1201,8 +1201,8 @@ void ED_mesh_polys_add(Mesh *mesh, ReportList *reports, int count) void ED_mesh_calc_tessface(Mesh *mesh, bool free_mpoly) { - if (mesh->edit_btmesh) { - BKE_editmesh_tessface_calc(mesh->edit_btmesh); + if (mesh->edit_mesh) { + BKE_editmesh_tessface_calc(mesh->edit_mesh); } else { BKE_mesh_tessface_calc(mesh); diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index bdab9aed094..1efa05bc60e 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -63,7 +63,7 @@ int ED_mesh_mirror_spatial_table(Object *ob, BMEditMesh *em, Mesh *me_eval, cons } else if (mode == 's') { /* start table */ Mesh *me = ob->data; - const bool use_em = (!me_eval && em && me->edit_btmesh == em); + const bool use_em = (!me_eval && em && me->edit_mesh == em); const int totvert = use_em ? em->bm->totvert : me_eval ? me_eval->totvert : me->totvert; if (MirrKdStore.tree) /* happens when entering this call without ending it */ @@ -136,7 +136,7 @@ static int mirrtopo_vert_sort(const void *v1, const void *v2) bool ED_mesh_mirrtopo_recalc_check(Mesh *me, Mesh *me_eval, MirrTopoStore_t *mesh_topo_store) { - const bool is_editmode = (me->edit_btmesh != NULL); + const bool is_editmode = (me->edit_mesh != NULL); int totvert; int totedge; @@ -144,9 +144,9 @@ bool ED_mesh_mirrtopo_recalc_check(Mesh *me, Mesh *me_eval, MirrTopoStore_t *mes totvert = me_eval->totvert; totedge = me_eval->totedge; } - else if (me->edit_btmesh) { - totvert = me->edit_btmesh->bm->totvert; - totedge = me->edit_btmesh->bm->totedge; + else if (me->edit_mesh) { + totvert = me->edit_mesh->bm->totvert; + totedge = me->edit_mesh->bm->totedge; } else { totvert = me->totvert; @@ -170,9 +170,9 @@ void ED_mesh_mirrtopo_init( Mesh *me, Mesh *me_eval, MirrTopoStore_t *mesh_topo_store, const bool skip_em_vert_array_init) { - const bool is_editmode = (me->edit_btmesh != NULL); + const bool is_editmode = (me->edit_mesh != NULL); MEdge *medge = NULL, *med; - BMEditMesh *em = me_eval ? NULL : me->edit_btmesh; + BMEditMesh *em = me_eval ? NULL : me->edit_mesh; /* editmode*/ BMEdge *eed; @@ -208,7 +208,7 @@ void ED_mesh_mirrtopo_init( /* Initialize the vert-edge-user counts used to detect unique topology */ if (em) { - totedge = me->edit_btmesh->bm->totedge; + totedge = me->edit_mesh->bm->totedge; BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { const int i1 = BM_elem_index_get(eed->v1), i2 = BM_elem_index_get(eed->v2); diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 6deb0fee743..7e737b9e89a 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -822,7 +822,7 @@ BMVert *editbmesh_get_x_mirror_vert(Object *ob, struct BMEditMesh *em, BMVert *e int ED_mesh_mirror_get_vert(Object *ob, int index) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0; int index_mirr; @@ -1255,7 +1255,7 @@ MDeformVert *ED_mesh_active_dvert_get_em(Object *ob, BMVert **r_eve) { if (ob->mode & OB_MODE_EDIT && ob->type == OB_MESH && ob->defbase.first) { Mesh *me = ob->data; - BMesh *bm = me->edit_btmesh->bm; + BMesh *bm = me->edit_mesh->bm; const int cd_dvert_offset = CustomData_get_offset(&bm->vdata, CD_MDEFORMVERT); if (cd_dvert_offset != -1) { diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 0115682c2c0..00d33ca46df 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -407,11 +407,11 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f if (obedit->type == OB_MESH) { Mesh *me = obedit->data; - if (me->edit_btmesh == NULL) { + if (me->edit_mesh == NULL) { return false; } - if (me->edit_btmesh->bm->totvert > MESH_MAX_VERTS) { + if (me->edit_mesh->bm->totvert > MESH_MAX_VERTS) { error("Too many vertices"); return false; } @@ -419,9 +419,9 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f EDBM_mesh_load(bmain, obedit); if (freedata) { - EDBM_mesh_free(me->edit_btmesh); - MEM_freeN(me->edit_btmesh); - me->edit_btmesh = NULL; + EDBM_mesh_free(me->edit_mesh); + MEM_freeN(me->edit_mesh); + me->edit_mesh = NULL; } /* will be recalculated as needed. */ { diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index a3c0892d1b1..45e2c0dd692 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -99,8 +99,8 @@ static void object_fmap_swap_edit_mode(Object *ob, int num1, int num2) 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) { @@ -238,7 +238,7 @@ static int face_map_assign_exec(bContext *C, wmOperator *UNUSED(op)) if (fmap) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMFace *efa; BMIter iter; int *map; @@ -286,7 +286,7 @@ static int face_map_remove_from_exec(bContext *C, wmOperator *UNUSED(op)) if (fmap) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMFace *efa; BMIter iter; int *map; @@ -331,7 +331,7 @@ void OBJECT_OT_face_map_remove_from(struct wmOperatorType *ot) static void fmap_select(Object *ob, bool select) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMFace *efa; BMIter iter; int *map; diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 0fb354554c3..b6ec7123d53 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -136,7 +136,7 @@ static bool return_editmesh_vgroup(Object *obedit, BMEditMesh *em, char *r_name, static void select_editbmesh_hook(Object *ob, HookModifierData *hmd) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMVert *eve; BMIter iter; int index = 0, nr = 0; @@ -316,7 +316,7 @@ static bool object_hook_index_array(Main *bmain, Scene *scene, Object *obedit, DEG_id_tag_update(obedit->data, 0); - em = me->edit_btmesh; + em = me->edit_mesh; EDBM_mesh_normals_update(em); BKE_editmesh_tessface_calc(em); diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index c91173d95ca..e4c84d26f7b 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -1485,7 +1485,7 @@ void OBJECT_OT_multires_base_apply(wmOperatorType *ot) static void modifier_skin_customdata_delete(Object *ob) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; if (em) BM_data_layer_free(em->bm, &em->bm->vdata, CD_MVERT_SKIN); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index e5a5c045f9d..00b32f6130d 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -144,7 +144,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) DEG_id_tag_update(obedit->data, 0); - em = me->edit_btmesh; + em = me->edit_mesh; EDBM_mesh_normals_update(em); BKE_editmesh_tessface_calc(em); diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 201e8a8ea16..4fd03d213bc 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -842,7 +842,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) if (obedit) { if (obedit->type == OB_MESH) { Mesh *me = obedit->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMVert *eve; BMIter iter; diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index e3bfd025e48..4e0d83f6e8a 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -147,8 +147,8 @@ bool ED_vgroup_parray_alloc(ID *id, MDeformVert ***dvert_arr, int *dvert_tot, co { Mesh *me = (Mesh *)id; - if (me->edit_btmesh) { - BMEditMesh *em = me->edit_btmesh; + if (me->edit_mesh) { + BMEditMesh *em = me->edit_mesh; BMesh *bm = em->bm; const int cd_dvert_offset = CustomData_get_offset(&bm->vdata, CD_MDEFORMVERT); BMIter iter; @@ -506,7 +506,7 @@ static void ED_mesh_defvert_mirror_update_em( const int cd_dvert_offset) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMVert *eve_mirr; bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0; @@ -543,7 +543,7 @@ static void ED_mesh_defvert_mirror_update_ob(Object *ob, int def_nr, int vidx) void ED_vgroup_vert_active_mirror(Object *ob, int def_nr) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; MDeformVert *dvert_act; if (me->editflag & ME_EDIT_MIRROR_X) { @@ -580,7 +580,7 @@ static void vgroup_remove_weight(Object *ob, const int def_nr) static bool vgroup_normalize_active_vertex(Object *ob, eVGroupSelect subset_type) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMVert *eve_act; int v_act; MDeformVert *dvert_act; @@ -619,7 +619,7 @@ static bool vgroup_normalize_active_vertex(Object *ob, eVGroupSelect subset_type static void vgroup_copy_active_to_sel(Object *ob, eVGroupSelect subset_type) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; MDeformVert *dvert_act; int i, vgroup_tot, subset_count; const bool *vgroup_validmap = BKE_object_defgroup_subset_from_select_type(ob, subset_type, &vgroup_tot, &subset_count); @@ -895,8 +895,8 @@ static float get_vert_def_nr(Object *ob, const int def_nr, const int vertnum) 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); /* warning, this lookup is _not_ fast */ @@ -972,8 +972,8 @@ static void vgroup_select_verts(Object *ob, int select) 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) { @@ -2210,7 +2210,7 @@ void ED_vgroup_mirror( /* only the active group */ if (ob->type == OB_MESH) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; if (em) { const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT); @@ -2387,8 +2387,8 @@ static void vgroup_assign_verts(Object *ob, const float weight) 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; int cd_dvert_offset; BMIter iter; @@ -3740,7 +3740,7 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr) MDeformVert *dvert_act; Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; float weight_act; int i; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index f48eefdc399..e458fdb873f 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -302,7 +302,7 @@ void draw_object_backbufsel( case OB_MESH: if (ob->mode & OB_MODE_EDIT) { Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; const bool draw_facedot = check_ob_drawface_dot(scene, v3d, ob->dt); const bool use_faceselect = (select_mode & SCE_SELECT_FACE) != 0; diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 47242c1fde7..e1e3b1a9a64 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -216,7 +216,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float if (ob->type == OB_MESH) { TransformMedian_Mesh *median = &median_basis.mesh; Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMesh *bm = em->bm; BMVert *eve; BMEdge *eed; @@ -557,7 +557,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float { const TransformMedian_Mesh *median = &median_basis.mesh, *ve_median = &ve_median_basis.mesh; Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMesh *bm = em->bm; BMIter iter; BMVert *eve; diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 9916aa846d6..a3ec716b6b8 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -561,7 +561,7 @@ static bool raycastEditMesh( BMEditMesh *em_orig; int looptri_num_active = -1; - /* Get original version of the edit_btmesh. */ + /* Get original version of the edit_mesh. */ em_orig = BKE_editmesh_from_object(DEG_get_original_object(ob)); if (sctx->callbacks.edit_mesh.test_face_fn) { @@ -640,7 +640,7 @@ static bool raycastEditMesh( retval = true; if (r_index) { - /* Get original version of the edit_btmesh. */ + /* Get original version of the edit_mesh. */ BMEditMesh *em_orig = BKE_editmesh_from_object(DEG_get_original_object(ob)); *r_index = BM_elem_index_get(em_orig->looptris[hit.index][0]->f); diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 16b85f53270..156f3367948 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -208,10 +208,10 @@ void ED_editors_exit(Main *bmain, bool do_undo_system) for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { if (ob->type == OB_MESH) { Mesh *me = ob->data; - if (me->edit_btmesh) { - EDBM_mesh_free(me->edit_btmesh); - MEM_freeN(me->edit_btmesh); - me->edit_btmesh = NULL; + if (me->edit_mesh) { + EDBM_mesh_free(me->edit_mesh); + MEM_freeN(me->edit_mesh); + me->edit_mesh = NULL; } } else if (ob->type == OB_ARMATURE) { diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 724ef6970ea..04ef2883c76 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -268,7 +268,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit, Depsgraph * if (sima->flag & SI_DRAWSHADOW) { bool is_cage_like_final_meshes = false; Mesh *me = (Mesh *)eval_ob->data; - BMEditMesh *embm = me->edit_btmesh; + BMEditMesh *embm = me->edit_mesh; is_cage_like_final_meshes = embm && embm->mesh_eval_final && embm->mesh_eval_final->runtime.is_original; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 8ec5fa5e57a..5d19973941f 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -4431,7 +4431,7 @@ static int uv_seams_from_islands_exec(bContext *C, wmOperator *op) for (uint ob_index = 0; ob_index < objects_len; ob_index++) { Object *ob = objects[ob_index]; Mesh *me = (Mesh *)ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMesh *bm = em->bm; UvVertMap *vmap; @@ -4578,7 +4578,7 @@ static int uv_mark_seam_exec(bContext *C, wmOperator *op) for (uint ob_index = 0; ob_index < objects_len; ob_index++) { Object *ob = objects[ob_index]; Mesh *me = (Mesh *)ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; BMesh *bm = em->bm; if (synced_selection && (bm->totedgesel == 0)) { -- cgit v1.2.3