Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak related to cubemaps. Missed this earlier.

Browse Source
This commit is contained in:
Shyotl
2011-08-29 03:22:42 -05:00
parent 2ff52baa20
commit aaa6417fb7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llprimitive/llmodel.cpp
View File

@@ -28,6 +28,7 @@
#if MESH_ENABLED #if MESH_ENABLED
#include "llmodel.h" #include "llmodel.h"
#include "llmemory.h"
#if MESH_IMPORT #if MESH_IMPORT
#include "llconvexdecomposition.h" #include "llconvexdecomposition.h"
#endif //MESH_IMPORT #endif //MESH_IMPORT

12
indra/llrender/llcubemap.cpp
View File

@@ -265,7 +265,7 @@ void LLCubeMap::setMatrix(S32 stage)
if (mMatrixStage < 0) return; if (mMatrixStage < 0) return;
if (stage > 0) //if (stage > 0)
{ {
gGL.getTexUnit(stage)->activate(); gGL.getTexUnit(stage)->activate();
} }
@@ -284,17 +284,17 @@ void LLCubeMap::setMatrix(S32 stage)
glLoadMatrixf((F32 *)trans.mMatrix); glLoadMatrixf((F32 *)trans.mMatrix);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
if (stage > 0) /*if (stage > 0)
{ {
gGL.getTexUnit(0)->activate(); gGL.getTexUnit(0)->activate();
} }*/
} }
void LLCubeMap::restoreMatrix() void LLCubeMap::restoreMatrix()
{ {
if (mMatrixStage < 0) return; if (mMatrixStage < 0) return;
if (mMatrixStage > 0) //if (mMatrixStage > 0)
{ {
gGL.getTexUnit(mMatrixStage)->activate(); gGL.getTexUnit(mMatrixStage)->activate();
} }
@@ -302,10 +302,10 @@ void LLCubeMap::restoreMatrix()
glPopMatrix(); glPopMatrix();
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
if (mMatrixStage > 0) /*if (mMatrixStage > 0)
{ {
gGL.getTexUnit(0)->activate(); gGL.getTexUnit(0)->activate();
} }*/
} }
void LLCubeMap::setReflection (void) void LLCubeMap::setReflection (void)