diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-14 16:57:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-14 16:57:42 -0500 |
| commit | 4e006b0e3891d5728a6753059f2c5afc77737482 (patch) | |
| tree | 96af37ac252d823f8dc51e20546848ad464e0274 /indra/newview/lltexlayer.cpp | |
| parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
| parent | c0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index e8abee2fb7..f44e62335d 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -295,6 +295,8 @@ BOOL LLTexLayerSetBuffer::render() BOOL success = TRUE; + LLVertexBuffer::unbind(); + //hack to use fixed function when updating tex layer sets bool no_ff = LLGLSLShader::sNoFixedFunction; LLGLSLShader::sNoFixedFunction = false; @@ -304,8 +306,6 @@ BOOL LLTexLayerSetBuffer::render() success &= mTexLayerSet->render( mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight ); gGL.flush(); - LLGLSLShader::sNoFixedFunction = no_ff; - if(upload_now) { if (!success) @@ -335,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); |