Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-17 10:05:18 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-17 10:05:18 +0300
commite0e6229176573484431d2bbf3ba0c2f849522789 (patch)
treebdf220c75443dfa2e5f5a4f59c1a380044a443cf /source/blender/editors/mesh/editmesh_undo.c
parent203b964ff4da6f4c6cd54937e0dd704ff1cfc7b0 (diff)
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.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_undo.c')
-rw-r--r--source/blender/editors/mesh/editmesh_undo.c8
1 files changed, 4 insertions, 4 deletions
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);
}