diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-05-16 17:15:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-16 17:17:26 +0300 |
| commit | 19955bd15209a92b1604e4c4894e8cce2546d9a5 (patch) | |
| tree | 5076ee78f90e431fcf42969548633e110faee5f5 /source/blender/editors/interface/interface_widgets.c | |
| parent | 575d7a9666e12ef6608af92d0bf2a9c590afc816 (diff) | |
Fix T48447: Inactive menu items don't grey-out icons
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index d1461f1acec..19e0b55374e 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -859,10 +859,17 @@ static void widget_draw_icon( else if (but->flag & UI_ACTIVE) {} else alpha = 0.5f; } - - /* extra feature allows more alpha blending */ - if ((but->type == UI_BTYPE_LABEL) && but->a1 == 1.0f) - alpha *= but->a2; + else if ((but->type == UI_BTYPE_LABEL)) { + /* extra feature allows more alpha blending */ + if (but->a1 == 1.0f) { + alpha *= but->a2; + } + } + else if (ELEM(but->type, UI_BTYPE_BUT)) { + if (but->flag & UI_BUT_DISABLED) { + alpha *= 0.5f; + } + } glEnable(GL_BLEND); |