diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-19 16:34:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-19 16:34:34 -0500 |
| commit | 233e42b3314c17b2e24334587d960af6e3dc963c (patch) | |
| tree | 480e571bf913bb0743c3c6c6ce846a69aa405504 /indra/newview/lltexlayer.cpp | |
| parent | 0e496309d6cb7581c9f69b7da244699c382750ac (diff) | |
| parent | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index e8abee2fb7..87e7a57ae8 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,6 +306,7 @@ BOOL LLTexLayerSetBuffer::render() success &= mTexLayerSet->render( mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight ); gGL.flush(); + LLVertexBuffer::unbind(); LLGLSLShader::sNoFixedFunction = no_ff; if(upload_now) |