diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-27 00:48:14 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-27 00:48:14 -0500 |
| commit | c8b8b153f14b65fa7d833d787df6c03539eb85a8 (patch) | |
| tree | ffc3c28a4c1f03d8204b5f4efdefa081a0dd3969 /indra | |
| parent | 7821ff23baafff4e7712a126c17c3947e7b4989e (diff) | |
SH-2242 Don't make LLDynamicTexture targets use shaders all the time (revisit later).
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index 4955b6224e..f9a213a86f 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -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; } |