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/blenkernel/intern/key.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/blenkernel/intern/key.c')
| -rw-r--r-- | source/blender/blenkernel/intern/key.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |