diff options
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index abaa832957d..3025b1bfc29 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1531,11 +1531,12 @@ static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int state, int rou static void widget_disabled(rcti *rect) { - float col[3]; + float col[4]; glEnable(GL_BLEND); - UI_GetThemeColor3fv(TH_BACK, col); + /* can't use theme TH_BACK or TH_PANEL... undefined */ + glGetFloatv(GL_COLOR_CLEAR_VALUE, col); glColor4f(col[0], col[1], col[2], 0.5f); glRectf(rect->xmin, rect->ymin, rect->xmax, rect->ymax); @@ -1708,12 +1709,6 @@ void ui_draw_but(ARegion *ar, uiStyle *style, uiBut *but, rcti *rect) case SEPR: break; - /* XXX in old code UI_EMBOSSP was set to distinguish these types, fix */ - case PULLDOWN: - case HMENU: - wt= widget_type(UI_WTYPE_PULLDOWN); - break; - default: wt= widget_type(UI_WTYPE_MENU_ITEM); } |