From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 27 Feb 2008 11:52:29 +0000 (+0000)
Subject: one last try to beat the OSX texture scrolling bug (set activetexture
X-Git-Tag: xonotic-v0.1.0preview~2380
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21b8a56df6b442830f16d41d96d269c69b50cf58;p=xonotic%2Fdarkplaces.git

one last try to beat the OSX texture scrolling bug (set activetexture
and clientactivetexture - even though only the former is needed, and do
so before switching the matrixmode to texture)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8142 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_backend.c b/gl_backend.c
index fefdf7f3..8ea67170 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -1825,8 +1825,9 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix)
 			unit->matrix = *matrix;
 			CHECKGLERROR
 			Matrix4x4_ToArrayDoubleGL(&unit->matrix, glmatrix);
-			qglMatrixMode(GL_TEXTURE);CHECKGLERROR
 			GL_ActiveTexture(unitnum);
+			GL_ClientActiveTexture(unitnum);
+			qglMatrixMode(GL_TEXTURE);CHECKGLERROR
 			qglLoadMatrixd(glmatrix);CHECKGLERROR
 			qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
 		}
@@ -1838,8 +1839,9 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix)
 		{
 			unit->texmatrixenabled = false;
 			CHECKGLERROR
-			qglMatrixMode(GL_TEXTURE);CHECKGLERROR
 			GL_ActiveTexture(unitnum);
+			GL_ClientActiveTexture(unitnum);
+			qglMatrixMode(GL_TEXTURE);CHECKGLERROR
 			qglLoadIdentity();CHECKGLERROR
 			qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
 		}