summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-08-24 15:41:00 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-08-24 15:41:00 -0700
commitbf0d36bf889bb913fbc2a53c5a1b9818acb11ee6 (patch)
tree62e75dd7ea2791addced07fa595dd37789cc12cc /indra/newview/lltexlayer.cpp
parent11d7a7f197d31617602ff9c109674a783fd6fa71 (diff)
Mac rendering now with 100% fewer crashes when enabling shadows.
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
-rw-r--r--indra/newview/lltexlayer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 87e7a57ae8..f44e62335d 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -306,9 +306,6 @@ BOOL LLTexLayerSetBuffer::render()
success &= mTexLayerSet->render( mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight );
gGL.flush();
- LLVertexBuffer::unbind();
- LLGLSLShader::sNoFixedFunction = no_ff;
-
if(upload_now)
{
if (!success)
@@ -338,6 +335,9 @@ BOOL LLTexLayerSetBuffer::render()
doUpdate();
}
+ LLVertexBuffer::unbind();
+ LLGLSLShader::sNoFixedFunction = no_ff;
+
// reset GL state
gGL.setColorMask(true, true);
gGL.setSceneBlendType(LLRender::BT_ALPHA);