forked from bartvdbraak/blender
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.
This commit is contained in:
parent
b410d06dde
commit
68a8efa8d3
@ -226,10 +226,10 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
|
||||
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()
|
||||
|
@ -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) {
|
||||
|
@ -559,7 +559,7 @@ static void rna_def_keyblock(BlenderRNA *brna)
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user