From 4b365064cfbd4cc802e0e575bcbbfc9539e9fda2 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 10 Feb 2017 00:00:21 +0100 Subject: Remove most (maybe all?) remaining yellow text Decided to request the text color as argument for UI_fonstyle_draw functions, rather than keeping it being another state to keep track of. --- source/blender/editors/space_info/textview.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source/blender/editors/space_info') diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index d3c8fed5fc1..8ee488ac591 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -200,17 +200,15 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str immUnbindProgram(); } - glColor3ubv(fg); - /* last part needs no clipping */ BLF_position(cdc->font_id, cdc->xy[0], cdc->lofs + cdc->xy[1], 0); + BLF_color3ubv(cdc->font_id, fg); BLF_draw_mono(cdc->font_id, s, len, cdc->cwidth); if (cdc->sel[0] != cdc->sel[1]) { console_step_sel(cdc, -initial_offset); // glColor4ub(255, 0, 0, 96); // debug console_draw_sel(s, cdc->sel, cdc->xy, len, cdc->cwidth, cdc->lheight, bg_sel); - glColor3ubv(fg); } cdc->xy[1] += cdc->lheight; @@ -226,7 +224,6 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str console_step_sel(cdc, len); // glColor4ub(0, 255, 0, 96); // debug console_draw_sel(s, cdc->sel, cdc->xy, len, cdc->cwidth, cdc->lheight, bg_sel); - glColor3ubv(fg); } cdc->xy[1] += cdc->lheight; @@ -254,8 +251,6 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str immUnbindProgram(); } - glColor3ubv(fg); - BLF_position(cdc->font_id, cdc->xy[0], cdc->lofs + cdc->xy[1], 0); BLF_draw_mono(cdc->font_id, str, str_len, cdc->cwidth); -- cgit v1.2.3