diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-10-30 14:26:11 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-10-30 14:26:11 +0200 |
| commit | dfa6822b3464fbf0d778b524c867bc7329121b4a (patch) | |
| tree | e42ad5f017a147365b435dde6f8e31d1f11bd772 /indra/llrender | |
| parent | 9e0d4d2646d14b59e0d47dbdcdad7ba3fa0a22c3 (diff) | |
MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader).
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | 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 41301b6c85..b481cf7095 100755 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -2196,9 +2196,8 @@ void LLRender::texCoord2fv(const GLfloat* tc) void LLRender::color4ub(const GLubyte& r, const GLubyte& g, const GLubyte& b, const GLubyte& a) { - if (LLGLSLShader::sNoFixedFunction && - (!LLGLSLShader::sCurBoundShaderPtr || - LLGLSLShader::sCurBoundShaderPtr->mAttributeMask & LLVertexBuffer::MAP_COLOR)) + if (!LLGLSLShader::sCurBoundShaderPtr || + LLGLSLShader::sCurBoundShaderPtr->mAttributeMask & LLVertexBuffer::MAP_COLOR) { mColorsp[mCount] = LLColor4U(r,g,b,a); } |