diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2017-02-06 18:35:42 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2017-02-06 18:35:42 +0300 |
commit | 6714f6ae2f78e1de53ff4a2916d7046485556509 (patch) | |
tree | d0ac43cd119732ddeb77b15b06d5de515ab077a2 /source/blender/editors/interface/interface_widgets.c | |
parent | 6d4f75a123cdbc33d83b61e46b7bd2ede6cc0fe9 (diff) | |
parent | e58359c26f2b68b04b28cbcd69c53f19818aa5e1 (diff) |
Merge branch 'blender2.8' into render-layers
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 9dd6c670da8..dd8db71eedd 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1457,7 +1457,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b } #endif - glColor4ubv((unsigned char *)wcol->text); + BLF_color4ubv(fstyle->uifont_id, (unsigned char *)wcol->text); if (!use_right_only) { /* for underline drawing */ @@ -4128,7 +4128,7 @@ void ui_draw_menu_item(uiFontStyle *fstyle, rcti *rect, const char *name, int ic UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0'); } - glColor4ubv((unsigned char *)wt->wcol.text); + BLF_color4ubv(fstyle->uifont_id, (unsigned char *)wt->wcol.text); UI_fontstyle_draw(fstyle, rect, drawstr); } @@ -4195,7 +4195,7 @@ void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, const char *name, int BLI_strncpy(drawstr, name, sizeof(drawstr)); UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0'); - glColor4ubv((unsigned char *)wt->wcol.text); + BLF_color4ubv(fstyle->uifont_id, (unsigned char *)wt->wcol.text); UI_fontstyle_draw(fstyle, &trect, drawstr); } } |