diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 10:05:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 10:05:18 +0300 |
| commit | e0e6229176573484431d2bbf3ba0c2f849522789 (patch) | |
| tree | bdf220c75443dfa2e5f5a4f59c1a380044a443cf /source/blender/editors/object/object_edit.c | |
| parent | 203b964ff4da6f4c6cd54937e0dd704ff1cfc7b0 (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/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 10 |
1 files changed, 5 insertions, 5 deletions
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. */ { |