display keyblock mute in the shape key list.

Realize this is bcon3 but this is was very bad IMHO.
- button adjusting key block was in between 2 object settings - which is misleading/confusing.
- you needed to click through all shapes to check which was muted, currently you's assume 1.0 means the shape is enabled.

1 files changed, 6 insertions, 3 deletions

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 2b0a406a421..1f6165852d7 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2150,7 +2150,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
 		Object *ob= (Object*)activeptr->data;
 		Key *key= (Key*)itemptr->id.data;
 
-		split= uiLayoutSplit(sub, 0.75f, 0);
+		split= uiLayoutSplit(sub, 0.66f, 0);
 
 		uiItemL(split, name, icon);
 
@@ -2158,10 +2158,13 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
 		row= uiLayoutRow(split, 1);
 		if(i == 0 || (key->type != KEY_RELATIVE)) uiItemL(row, "", ICON_NONE);
 		else uiItemR(row, itemptr, "value", 0, "", ICON_NONE);
+		uiItemR(row, itemptr, "mute", 0, "", 0);
 
-		if(ob->mode == OB_MODE_EDIT && !((ob->shapeflag & OB_SHAPE_EDIT_MODE) && ob->type == OB_MESH))
+		if( (key->flag & KEYBLOCK_MUTE) ||
+		    (ob->mode == OB_MODE_EDIT && !((ob->shapeflag & OB_SHAPE_EDIT_MODE) && ob->type == OB_MESH)) )
+		{
 			uiLayoutSetActive(row, 0);
-		//uiItemR(row, itemptr, "mute", 0, "", ICON_MUTE_IPO_OFF);
+		}
 		uiBlockSetEmboss(block, UI_EMBOSS);
 	}
 	else if(itemptr->type == &RNA_VertexGroup) {