Added warning for if user attempts to sculpt on a shapekey without turning on the lock (doesn't make sense to sculpt on an interpolated shapekey.)

1 files changed, 6 insertions, 0 deletions

diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c
index 161dcf613d3..a9d1e02885c 100644
--- a/source/blender/src/sculptmode.c
+++ b/source/blender/src/sculptmode.c
@@ -1851,6 +1851,12 @@ void sculpt()
 		return;
 	if(!(ob->lay & G.vd->lay))
 		error("Active object is not in this layer");
+	if(ob_get_keyblock(ob)) {
+		if(!(ob->shapeflag & OB_SHAPE_LOCK)) {
+			error("Cannot sculpt on unlocked shape key");
+			return;
+		}
+	}
 	
 	if(!ss) {
 		sculpt_init_session();