Save state before drawing '3d' panel, and then restore it after.

[flightgear.git] / src / Cockpit / panel.cxx

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index a7cbecb1a4192126b0a32205a3165fccc331feb0..52810a2850448c60fdf9df85951064bb1a31a123 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -54,14 +54,6 @@
 // my hardware/driver requires many more.
 #define POFF_UNITS 40
 
-#if defined( NONE ) && defined( _MSC_VER )
-#  pragma message( "A sloppy coder has defined NONE as a macro!!!" )
-#  undef NONE
-#elif defined( NONE )
-#  pragma warn A sloppy coder has defined NONE as a macro!!!
-#  undef NONE
-#endif
-
 \f
 ////////////////////////////////////////////////////////////////////////
 // Local functions.
@@ -367,6 +359,10 @@ FGPanel::draw()
   glEnable(GL_POLYGON_OFFSET_FILL);
   glPolygonOffset(0, -POFF_UNITS);
 
+  // save some state
+  glPushAttrib( GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_LIGHTING_BIT
+                | GL_TEXTURE_BIT | GL_PIXEL_MODE_BIT );
+
   // Draw the background
   glEnable(GL_TEXTURE_2D);
   glDisable(GL_LIGHTING);
@@ -425,6 +421,8 @@ FGPanel::draw()
     glPopMatrix();
   }
 
+  // restore some original state
+  glPopAttrib();
   glDisable(GL_POLYGON_OFFSET_FILL);
 }