[Bf-blender-cvs] [4638ca0] master: Fix T39956.

[Antony Riakiotakis]

Commit: 4638ca0ebe42d5d33d32d9087d0a8e28746f76eb
Author: Antony Riakiotakis
Date:   Mon May 5 22:39:55 2014 +0300
https://developer.blender.org/rB4638ca0ebe42d5d33d32d9087d0a8e28746f76eb

Fix T39956.

Even locked shape keys need to be flushed if user is in textured or
wireframe mode.

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

M	source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index a9f8abb..df7477e 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -198,8 +198,7 @@ static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob)
 	if (mmd || ob->sculpt->bm)
 		return 0;
 
-	/* non-locked shape keys could be handled in the same way as deformed mesh */
-	if ((ob->shapeflag & OB_SHAPE_LOCK) == 0 && me->key && ob->shapenr)
+	if (me->key && ob->shapenr)
 		return 1;
 
 	md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
@@ -3424,7 +3423,7 @@ static void sculpt_flush_stroke_deform(Sculpt *sd, Object *ob)
 		MEM_freeN(nodes);
 
 		/* Modifiers could depend on mesh normals, so we should update them/
-		 * Note, then if sculpting happens on locked key, normals should be re-calculated
+		 * Note, then if sculpting happens on key, normals should be re-calculated
 		 * after applying coords from keyblock on base mesh */
 		BKE_mesh_calc_normals(me);
 	}