popmatrix got shifted in a bad cvs conflict

diff --git a/render2/paint.c b/render2/paint.c
index ea478cb47c4911a9cb6e6f2ac7a034e3906c6159..ff783dc5e41211fbab173d916d62de83c05aa434 100644 (file)
--- a/render2/paint.c
+++ b/render2/paint.c
@@ -100,10 +100,10 @@ void RrPaint(struct RrSurface *sur)
         break;
     }
 
-    glPopMatrix();
-
     for (i = 0; i < sur->ntextures; ++i)
         RrTexturePaint(sur, &sur->texture[i]);
 
+    glPopMatrix();
+
     glXSwapBuffers(RrDisplay(inst), RrSurfaceWindow(sur));
 }