diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 23:58:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 23:58:56 +0400 |
| commit | b330abc290622b32419ba084b8bc7e6a8ea9aaa2 (patch) | |
| tree | 62c0590af336f1028fd05ffd33c28b7dec0f0c3c /source/blender/bmesh/operators/bmo_mesh_conv.c | |
| parent | 42b3463030b07ba3a87574c173e759e3bb15353b (diff) | |
remove Object member from BMesh struct - was only used for undo and BMEditMesh already stores an object pointer.
also fix for own mistake with mesh conversion refactor, shape key index was off by 1 when switching editmode.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_mesh_conv.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_mesh_conv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 651093806b6..4578270d571 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -57,7 +57,7 @@ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) Mesh *me = BMO_slot_ptr_get(op, "mesh"); int set_key = BMO_slot_bool_get(op, "set_shapekey"); - BM_mesh_bm_from_me(bm, me, set_key, ob->shapenr - 1); + BM_mesh_bm_from_me(bm, me, set_key, ob->shapenr); if (me->key && ob->shapenr > me->key->totkey) { ob->shapenr = me->key->totkey - 1; |