diff options
| author | Julian Eisel <julian@blender.org> | 2020-06-09 21:35:40 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-06-09 21:42:22 +0300 |
| commit | d1932a8ed6001c120149ce4dd1be6a0415d66f28 (patch) | |
| tree | dd7270150169f3b6bf6fa4d63679d605bfe8e1b3 | |
| parent | 819ebc990144c516e1ae393b6e6ecdf98a184811 (diff) | |
Fix missing animation decorators for pointer buttons
Also, remove manually placed decorator for vertex groups in modifiers. This was
only needed because of this bug, and the layout was slightly misaligned.
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_ui_common.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 884e43b4026..196fdf47bd3 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1054,7 +1054,7 @@ static uiBut *ui_item_with_label(uiLayout *layout, #ifdef UI_PROP_DECORATE /* Only for alignment. */ - if (layout->item.flag & UI_ITEM_PROP_SEP) { + if (use_prop_sep) { /* Flag may have been unset meanwhile. */ if ((layout->item.flag & UI_ITEM_PROP_DECORATE) && (layout->item.flag & UI_ITEM_PROP_DECORATE_NO_PAD) == 0) { uiItemL(layout_prop_decorate ? layout_prop_decorate : sub, NULL, ICON_BLANK1); diff --git a/source/blender/modifiers/intern/MOD_ui_common.c b/source/blender/modifiers/intern/MOD_ui_common.c index 973afe5fef6..cc0d3d8ccee 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.c +++ b/source/blender/modifiers/intern/MOD_ui_common.c @@ -172,9 +172,6 @@ void modifier_vgroup_ui(uiLayout *layout, uiLayoutSetPropDecorate(sub, false); uiItemR(sub, ptr, invert_vgroup_prop, 0, "", ICON_ARROW_LEFTRIGHT); } - if (uiLayoutGetPropDecorate(layout)) { - uiItemL(row, "", ICON_BLANK1); - } } /** |