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

Merge branch 'master' of https://github.com/siana/SingularityViewer

Browse Source
This commit is contained in:
TighMacFanatic
2011-12-03 11:52:29 -05:00
parent f613be9276 d63df79b85
commit 2565caf62a
23 changed files with 7720 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llrender/llcubemap.cpp
View File

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