From 009ff54aea9168db607187fb0b63f9d989080c95 Mon Sep 17 00:00:00 2001 From: Manolo Gouy <Manolo> Date: Tue, 13 Apr 2010 21:34:20 +0000 Subject: [PATCH] gl_draw.cxx (Mac-specific): fixed bad shading of text color. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7497 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/gl_draw.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 432774ea5..d6284dc7f 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -437,6 +437,8 @@ void gl_texture_fifo::display_texture(int rank) glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); // ditto glEnable (GL_TEXTURE_RECTANGLE_EXT); + GLboolean lighting = glIsEnabled(GL_LIGHTING); + if (lighting) glDisable(GL_LIGHTING); glBindTexture (GL_TEXTURE_RECTANGLE_EXT, fifo[rank].texName); glBegin (GL_QUADS); glTexCoord2f (0.0f, 0.0f); // draw lower left in world coordinates @@ -451,7 +453,8 @@ void gl_texture_fifo::display_texture(int rank) glTexCoord2f (fifo[rank].width, 0.0f); // draw lower right in world coordinates glVertex2f (bounds.origin.x + bounds.size.width, bounds.origin.y); glEnd (); - + if (lighting) glEnable(GL_LIGHTING); + glPopAttrib(); // reset original matrices glPopMatrix(); // GL_MODELVIEW -- GitLab