From a0be14869fb55271e47964219ecdfa20a91f39ef Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Thu, 26 Jan 2012 14:46:59 -0500 Subject: [PATCH] Fix state saving to handle any blend/colormode --- src/modules/graphics/opengl/Graphics.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index 066abc328..1e0f15eb6 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -69,16 +69,9 @@ namespace opengl s.color = getColor(); s.backgroundColor = getBackgroundColor(); - - //store modes here - GLint mode; - //get blend mode - glGetIntegerv(GL_BLEND_DST, &mode); - //following syntax seems better than if-else every time - s.blendMode = (mode == GL_ONE) ? Graphics::BLEND_ADDITIVE : Graphics::BLEND_ALPHA; - //get color mode - glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &mode); - s.colorMode = (mode == GL_MODULATE) ? Graphics::COLOR_MODULATE : Graphics::COLOR_REPLACE; + + s.blendMode = getBlendMode(); + s.colorMode = getColorMode(); //get line style s.lineStyle = lineStyle; //get the point size