livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader).

meow-7.2.2
Mnikolenko ProductEngine 2013-10-30 14:26:11 +02:00
parent 9e0d4d2646
commit dfa6822b34
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llrender/llrender.cpp
View File

@ -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);
}