Merge commit '833d947959e424126907d552840203a557097e8f' into master-merge

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

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 451f94a64237869f06ff0a4a27a2af3aa44ad65d..1e213b5745b8ab7b673c401d2a6bbfcaa84001eb 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -1329,12 +1329,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 );