Shape Keys

==========

- Added a Mute button for shape keys, useful for debugging the influence
  of driven shape keys.
- Bugfix for the shape keys relative to others keys, was hanging in
  an eternal loop when deleting the other key.

1 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c
index 0d861cda5d0..5cc193f8844 100644
--- a/source/blender/src/editkey.c
+++ b/source/blender/src/editkey.c
@@ -625,7 +625,7 @@ void insert_shapekey(Object *ob)
 
 void delete_key(Object *ob)
 {
-	KeyBlock *kb;
+	KeyBlock *kb, *rkb;
 	Key *key;
 	IpoCurve *icu;
 	
@@ -635,6 +635,10 @@ void delete_key(Object *ob)
 	kb= BLI_findlink(&key->block, ob->shapenr-1);
 
 	if(kb) {
+		for(rkb= key->block.first; rkb; rkb= rkb->next)
+			if(rkb->relative == ob->shapenr-1)
+				rkb->relative= 0;
+
 		BLI_remlink(&key->block, kb);
 		key->totkey--;
 		if(key->refkey== kb) key->refkey= key->block.first;