diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-06 02:41:09 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-06 02:41:09 -0500 |
| commit | 70f959f01e845b3a7b6211f82c20d0cbd6641c39 (patch) | |
| tree | 1964817c64963b2e580b547f077f739dea46b00c /indra/llrender | |
| parent | ffab1eef57813625cae51bffd8dd830371b2e203 (diff) | |
SH-1738 Fix for broken UI text when deferred rendering enabled.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llrender.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index e91ceb873e..6a3f186531 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -184,8 +184,7 @@ void LLTexUnit::enable(eTextureType type) mCurrTexType = type; gGL.flush(); - if (LLGLSLShader::sCurBoundShader == 0 && - type != LLTexUnit::TT_MULTISAMPLE_TEXTURE && + if (type != LLTexUnit::TT_MULTISAMPLE_TEXTURE && mIndex < gGLManager.mNumTextureUnits) { glEnable(sGLTextureType[type]); @@ -202,7 +201,7 @@ void LLTexUnit::disable(void) activate(); unbind(mCurrTexType); gGL.flush(); - if (LLGLSLShader::sCurBoundShader == 0 && mCurrTexType != LLTexUnit::TT_MULTISAMPLE_TEXTURE && + if (mCurrTexType != LLTexUnit::TT_MULTISAMPLE_TEXTURE && mIndex < gGLManager.mNumTextureUnits) { glDisable(sGLTextureType[mCurrTexType]); |