[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43766] trunk/blender: display keyblock mute in the shape key list.

Campbell Barton ideasman42 at gmail.com
Mon Jan 30 10:49:36 CET 2012


Revision: 43766
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43766
Author:   campbellbarton
Date:     2012-01-30 09:49:30 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/makesrna/intern/rna_key.c

Property Changed:
----------------
    trunk/blender/release/scripts/startup/bl_ui/


Property changes on: trunk/blender/release/scripts/startup/bl_ui
___________________________________________________________________
Modified: svn:ignore
   - *.pyc

   + *.pyc
.goutputstream-2GCN8V


Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py	2012-01-30 09:19:38 UTC (rev 43765)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py	2012-01-30 09:49:30 UTC (rev 43766)
@@ -226,10 +226,10 @@
             row.alignment = 'RIGHT'
 
             sub = row.row(align=True)
+            sub.label()  # XXX, for alignment only
             subsub = sub.row(align=True)
             subsub.active = enable_edit_value
             subsub.prop(ob, "show_only_shape_key", text="")
-            subsub.prop(kb, "mute", text="")
             sub.prop(ob, "use_shape_key_edit_mode", text="")
 
             sub = row.row()

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2012-01-30 09:19:38 UTC (rev 43765)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2012-01-30 09:49:30 UTC (rev 43766)
@@ -2150,7 +2150,7 @@
 		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 @@
 		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) {

Modified: trunk/blender/source/blender/makesrna/intern/rna_key.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_key.c	2012-01-30 09:19:38 UTC (rev 43765)
+++ trunk/blender/source/blender/makesrna/intern/rna_key.c	2012-01-30 09:49:30 UTC (rev 43766)
@@ -559,7 +559,7 @@
 	prop= RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", KEYBLOCK_MUTE);
 	RNA_def_property_ui_text(prop, "Mute", "Mute this shape key");
-	RNA_def_property_ui_icon(prop, ICON_MUTE_IPO_OFF, 1);
+	RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1);
 	RNA_def_property_update(prop, 0, "rna_Key_update_data");
 
 	prop= RNA_def_property(srna, "slider_min", PROP_FLOAT, PROP_NONE);



More information about the Bf-blender-cvs mailing list