Merge commit '7ca59bef0ae15880f51b2f68104b933e918d543c' into garux-merge

[xonotic/netradiant.git] / radiant / texwindow.cpp

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 82e732039ef82c2287e2fd59ac620d132ddc709b..6b9fa79531ad551cbc2833b2afbda8f9abda6260 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -1270,12 +1270,14 @@ void Texture_Draw( TextureBrowser& textureBrowser ){
                                glVertex2f( xfMax ,yfMin );
                                glVertex2f( xfMax ,yfMax );
                                glEnd();
+                               glEnable( GL_TEXTURE_2D );
                        }
 
                        // shader stipple:
                        if ( !shader->IsDefault() ) {
                                glEnable( GL_LINE_STIPPLE );
                                glLineStipple( 1, 0xF000 );
+                               glDisable( GL_TEXTURE_2D );
                                glBegin( GL_LINE_LOOP );
                                glColor3f( 0, 0, 0 );
                                glVertex2f( xfMin ,yfMax );