Changeset 7919 in orxonox.OLD for trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc

Timestamp:

May 28, 2006, 3:48:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

• trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc (modified) (1 diff)

trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc

@@ -240 +240 @@
   glEnd();
 
-  glDisable(GL_TEXTURE_2D);
   /* draw white border */
   glBegin(GL_LINE_LOOP);