diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-05 09:25:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-05 09:25:20 +0400 |
| commit | 8cddb18da05eeed43bedffb9079869cfc9d0f4cd (patch) | |
| tree | 01d1f584c908e398f4219f2c8e343b343bdd010f /source/blender/editors/interface | |
| parent | db562488d672567dd367d64fa7a8a081e9dcbf9e (diff) | |
- fix error with conflusing key/keyblock in the shape template UI - absolute keyblocks would always be greyed out.
- fix mistake setting wrong variable in unlikely case of curve having no bezier or point array set.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 81db18aa0f8..9a02b858731 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2165,6 +2165,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe else if (itemptr->type == &RNA_ShapeKey) { Object *ob = (Object *)activeptr->data; Key *key = (Key *)itemptr->id.data; + KeyBlock *kb = (KeyBlock *)itemptr->data; split = uiLayoutSplit(sub, 0.66f, 0); @@ -2176,8 +2177,8 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe else uiItemR(row, itemptr, "value", 0, "", ICON_NONE); uiItemR(row, itemptr, "mute", 0, "", 0); - if ( (key->flag & KEYBLOCK_MUTE) || - (ob->mode == OB_MODE_EDIT && !((ob->shapeflag & OB_SHAPE_EDIT_MODE) && ob->type == OB_MESH)) ) + if ((kb->flag & KEYBLOCK_MUTE) || + (ob->mode == OB_MODE_EDIT && !((ob->shapeflag & OB_SHAPE_EDIT_MODE) && ob->type == OB_MESH))) { uiLayoutSetActive(row, 0); } |