diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:55:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:55:11 -0500 |
| commit | f72a24bf3a5bf7ecb826ef5e6d7f17dbb92d5db2 (patch) | |
| tree | a4a070ba8b95645089dcd55a848baec41b625cbc /indra/llrender/llcubemap.cpp | |
| parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
| parent | 530981a2149a74e1dc003cea1bbc9dc392fcae60 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llcubemap.cpp')
| -rw-r--r-- | indra/llrender/llcubemap.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp index 1b10354c22..5eb29efbfa 100644 --- a/indra/llrender/llcubemap.cpp +++ b/indra/llrender/llcubemap.cpp @@ -273,10 +273,10 @@ void LLCubeMap::setMatrix(S32 stage) LLMatrix4 trans(mat3); trans.transpose(); - glMatrixMode(GL_TEXTURE); - glPushMatrix(); - glLoadMatrixf((F32 *)trans.mMatrix); - glMatrixMode(GL_MODELVIEW); + gGL.matrixMode(LLRender::MM_TEXTURE); + gGL.pushMatrix(); + gGL.loadMatrix((F32 *)trans.mMatrix); + gGL.matrixMode(LLRender::MM_MODELVIEW); /*if (stage > 0) { @@ -292,9 +292,9 @@ void LLCubeMap::restoreMatrix() { gGL.getTexUnit(mMatrixStage)->activate(); } - glMatrixMode(GL_TEXTURE); - glPopMatrix(); - glMatrixMode(GL_MODELVIEW); + gGL.matrixMode(LLRender::MM_TEXTURE); + gGL.popMatrix(); + gGL.matrixMode(LLRender::MM_MODELVIEW); /*if (mMatrixStage > 0) { |