[Bf-blender-cvs] [225e346] master: Fix: Shapekey Basis not updated on editmode exit

[Campbell Barton]

Commit: 225e3460d02eafad31b9709c981dd8376878eaa6
Author: Campbell Barton
Date:   Mon Nov 10 13:32:39 2014 +0100
Branches: master
https://developer.blender.org/rB225e3460d02eafad31b9709c981dd8376878eaa6

Fix: Shapekey Basis not updated on editmode exit

===================================================================

M	source/blender/editors/mesh/editmesh_utils.c
M	source/blender/editors/object/object_shapekey.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 3075039..72d076d 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 4a24ab6..b9c8ab1 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;