diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-11-22 16:40:57 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-11-22 16:40:57 +0300 |
| commit | 60ce60238046a355ccf7200cbce2e0e6a60b19ec (patch) | |
| tree | c3cbdb0422d9c1289b73f85fc5027eafd029cdc5 /source/blender/editors/interface/interface_style.c | |
| parent | 559bd7576602e04b1895481561b054e67982351c (diff) | |
Fix missing conversion of uchar color to float
Decided to just pass float [4] args, so no type conversion is needed at all.
Diffstat (limited to 'source/blender/editors/interface/interface_style.c')
| -rw-r--r-- | source/blender/editors/interface/interface_style.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index fd127ac6182..0df115ddc4b 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -293,7 +293,7 @@ void UI_fontstyle_draw_simple(const uiFontStyle *fs, float x, float y, const cha */ void UI_fontstyle_draw_simple_backdrop( const uiFontStyle *fs, float x, float y, const char *str, - const unsigned char fg[4], const unsigned char bg[4]) + const float col_fg[4], const float col_bg[4]) { if (fs->kerning == 1) BLF_enable(fs->uifont_id, BLF_KERNING_DEFAULT); @@ -314,9 +314,9 @@ void UI_fontstyle_draw_simple_backdrop( (y + decent) - margin, x + width + margin, (y + decent) + height + margin, - margin, bg); + margin, (float *)col_bg); - glColor4ubv(fg); + glColor4fv(col_fg); } |