diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 6 | ||||
-rw-r--r-- | source/blender/editors/object/object_shapekey.c | 1 |
2 files changed, 6 insertions, 1 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 diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 4a24ab66721..b9c8ab1e35f 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -379,7 +379,6 @@ void OBJECT_OT_shape_key_remove(wmOperatorType *ot) ot->description = "Remove shape key from the object"; /* api callbacks */ - ot->poll = shape_key_mode_poll; ot->poll = shape_key_mode_exists_poll; ot->exec = shape_key_remove_exec; |