From b197a7ea698eac7fc671a985f672948a9a842791 Mon Sep 17 00:00:00 2001 From: Diego Borghetti Date: Tue, 3 Jan 2012 19:41:36 +0000 Subject: Fix: [#25834] no color of textobjects in game engine when combined with textured objects [#26893] Curruption of displayed text (debug properties/fps info or bgui) when using animated/tile uv mode The first bug was beacuse a bad mode on the texture environment, now we save the current glTexEnvi, set the one that we need, draw and restore the original at the end. The second was because a missing call to glLoadIdentity for the texture matrix and as we do before, now we do a gl-Push/Identity/Pop for this matrix to. The first problem was solved by Kanttori and the second by Dalai. --- 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 f0cfcdc97b9..f8c589a7051 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -368,6 +368,7 @@ int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y) float dx, dx1; float y1, y2; float xo, yo; + GLint param; if ((!g->width) || (!g->height)) return 1; @@ -449,6 +450,11 @@ int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y) glBindTexture(GL_TEXTURE_2D, (font->tex_bind_state= g->tex)); } + /* Save the current parameter to restore it later. */ + glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, ¶m); + if (param != GL_MODULATE) + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + if (font->flags & BLF_SHADOW) { switch(font->shadow) { @@ -487,5 +493,9 @@ int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y) break; } + /* and restore the original value. */ + if (param != GL_MODULATE) + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, param); + return 1; } -- cgit v1.2.3