diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-30 13:41:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-30 13:50:06 +0300 |
| commit | 41d1af9a1151331171f25c3c799254b70a28d371 (patch) | |
| tree | 72b9116c527db2d910174e4800f361bee8e124b8 /source/blender/editors/interface | |
| parent | 5e66791b86757f1e8f3e27134406ca1284d78e0e (diff) | |
UI: check prop-separate before adding black decorator
This caused the blank icon to be added to menus (ndof menu for eg).
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index cb83f6e4f48..dea0e03fea2 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -813,10 +813,12 @@ static uiBut *ui_item_with_label( #ifdef UI_PROP_DECORATE /* Only for alignment. */ - if ((layout->item.flag & UI_ITEM_PROP_DECORATE) && - (layout->item.flag & UI_ITEM_PROP_DECORATE_NO_PAD) == 0) - { - uiItemL(sub, NULL, ICON_BLANK1); + if (layout->item.flag & UI_ITEM_PROP_SEP) { + if ((layout->item.flag & UI_ITEM_PROP_DECORATE) && + (layout->item.flag & UI_ITEM_PROP_DECORATE_NO_PAD) == 0) + { + uiItemL(sub, NULL, ICON_BLANK1); + } } #endif /* UI_PROP_DECORATE */ |