Disabled interaction between multires and shape keys. Attempting to add a shape key on a multires mesh will give an error, and attempting to add multires to a mesh with shape keys will give the user an okee before deleting shape keys. (This isn't an optimal solution to the multires/shapekey situation, but a real fix is non-trivial.)

1 files changed, 6 insertions, 2 deletions

diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 34890a9a48f..92535f4635e 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -601,8 +601,12 @@ void do_common_editbuts(unsigned short event) // old name, is a mix of object an
 		break;
 	
 	case B_ADDKEY:
-		insert_shapekey(ob);
-		set_sculpt_object(ob);
+		if(get_mesh(ob) && get_mesh(ob)->mr) {
+			error("Cannot create shape keys on a multires mesh.");
+		} else {
+			insert_shapekey(ob);
+			set_sculpt_object(ob);
+		}
 		break;
 	case B_SETKEY:
 		ob->shapeflag |= OB_SHAPE_TEMPLOCK;