From: Derek Foreman <manmower@gmail.com>
Date: Mon, 2 Jun 2003 02:23:40 +0000 (+0000)
Subject: popmatrix got shifted in a bad cvs conflict
X-Git-Tag: gl2~3
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=1a381b18a8af955e87bb88a6ab6792166e2c0bb5;p=dana%2Fopenbox.git

popmatrix got shifted in a bad cvs conflict
---

diff --git a/render2/paint.c b/render2/paint.c
index ea478cb4..ff783dc5 100644
--- 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));
 }