From f0404c3382f36554ed52b7765029c1b8dc6cacb3 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 10 Apr 2017 21:21:38 +0200 Subject: Get rid of last PRIM_QUAD usage, in blf_font.c/blf_glyph.c. --- source/blender/blenfont/intern/blf_glyph.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source/blender/blenfont/intern/blf_glyph.c') diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index fa37f88d91f..b4d29b5d61e 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -317,6 +317,7 @@ void blf_glyph_free(GlyphBLF *g) static void blf_texture_draw(const unsigned char color[4], float uv[2][2], float dx, float y1, float dx1, float y2) { + /* First triangle. */ immAttrib2f(BLF_COORD_ID, uv[0][0], uv[0][1]); immSkipAttrib(BLF_COLOR_ID); /* skip color of most vertices */ immVertex2f(BLF_POS_ID, dx, y1); @@ -325,6 +326,15 @@ static void blf_texture_draw(const unsigned char color[4], float uv[2][2], float immSkipAttrib(BLF_COLOR_ID); immVertex2f(BLF_POS_ID, dx, y2); + immAttrib2f(BLF_COORD_ID, uv[1][0], uv[1][1]); + immAttrib4ubv(BLF_COLOR_ID, color); /* set color of provoking vertex */ + immVertex2f(BLF_POS_ID, dx1, y2); + + /* Second triangle. */ + immAttrib2f(BLF_COORD_ID, uv[0][0], uv[0][1]); + immSkipAttrib(BLF_COLOR_ID); /* skip color of most vertices */ + immVertex2f(BLF_POS_ID, dx, y1); + immAttrib2f(BLF_COORD_ID, uv[1][0], uv[1][1]); immSkipAttrib(BLF_COLOR_ID); immVertex2f(BLF_POS_ID, dx1, y2); -- cgit v1.2.3