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

Some minor cleanup. Bringing stuff in-line with current to ensure it all works before mesh is actually plugged in.

Browse Source
This commit is contained in:
Shyotl
2011-07-23 03:24:10 -05:00
parent 07c892480a
commit 179193d173
10 changed files with 121 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lldrawpool.cpp
View File

@@ -471,6 +471,8 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
{
applyModelMatrix(params);
bool tex_setup = false;
if (texture)
{
if (params.mTexture.notNull())
@@ -479,6 +481,7 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
gGL.getTexUnit(0)->bind(params.mTexture, TRUE) ;
if (params.mTextureMatrix)
{
tex_setup = true;
glMatrixMode(GL_TEXTURE);
glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
gPipeline.mTextureMatrixOps++;
@@ -501,7 +504,7 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
gPipeline.addTrianglesDrawn(params.mCount/3);
}
if (params.mTextureMatrix && texture && params.mTexture.notNull())
if (tex_setup)
{
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);