diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-07-28 10:41:59 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-07-28 10:41:59 -0400 |
| commit | 814a2d24dca5181a31316a6f5e00e1a1cf55f23e (patch) | |
| tree | c57c3bb773070bba41251a857b59549fe7e04303 /indra/newview/lltexlayer.cpp | |
| parent | b6be1bb71853d6a5b6b6fd9423fa00ffc8ce096c (diff) | |
| parent | 825fc273ee5167052d811dc058b1834c86e005da (diff) | |
Merge
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index bd41aa64f0..e8abee2fb7 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -45,6 +45,7 @@ #include "llagentwearables.h" #include "llwearable.h" #include "llviewercontrol.h" +#include "llviewershadermgr.h" #include "llviewervisualparam.h" //#include "../tools/imdebug/imdebug.h" @@ -294,11 +295,17 @@ BOOL LLTexLayerSetBuffer::render() BOOL success = TRUE; + //hack to use fixed function when updating tex layer sets + bool no_ff = LLGLSLShader::sNoFixedFunction; + LLGLSLShader::sNoFixedFunction = false; + // Composite the color data LLGLSUIDefault gls_ui; success &= mTexLayerSet->render( mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight ); gGL.flush(); + LLGLSLShader::sNoFixedFunction = no_ff; + if(upload_now) { if (!success) |