livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-2242 Don't make LLDynamicTexture targets use shaders all the time (revisit later).

meow-7.2.2
Dave Parks 2011-08-27 00:48:14 -05:00
parent 7821ff23ba
commit c8b8b153f1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lldynamictexture.cpp
View File

@ -210,6 +210,9 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
LLGLSLShader::bindNoShader();
LLVertexBuffer::unbind();
bool no_ff = LLGLSLShader::sNoFixedFunction;
LLGLSLShader::sNoFixedFunction = false;
BOOL result = FALSE;
BOOL ret = FALSE ;
for( S32 order = 0; order < ORDER_COUNT; order++ )
@ -240,6 +243,8 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
}
}
LLGLSLShader::sNoFixedFunction = no_ff;
return ret;
}