diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-11-10 15:32:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-10 15:32:39 +0300 |
commit | 225e3460d02eafad31b9709c981dd8376878eaa6 (patch) | |
tree | 7035c04c1769e9b8e7429cc51753ec988ecb84ae /source/blender/editors/mesh/editmesh_utils.c | |
parent | 723f1e950b1db926785a77b5321b79487f1ce7d1 (diff) |
Fix: Shapekey Basis not updated on editmode exit
Diffstat (limited to 'source/blender/editors/mesh/editmesh_utils.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 30750393f39..72d076dc3d6 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -381,6 +381,12 @@ void EDBM_mesh_load(Object *ob) Mesh *me = ob->data; BMesh *bm = me->edit_btmesh->bm; + /* Workaround for T42360, 'ob->shapenr' should be 1 in this case. + * however this isn't synchronized between objects at the moment. */ + if (UNLIKELY((ob->shapenr == 0) && (me->key && !BLI_listbase_is_empty(&me->key->block)))) { + bm->shapenr = 1; + } + BM_mesh_bm_to_me(bm, me, false); #ifdef USE_TESSFACE_DEFAULT |