diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
| commit | 54bba824228162724a1d46d9c7900e9aa7a077a3 (patch) | |
| tree | 3355699f63f141e5fc0546dfe279b8aa65d40e07 /indra/llrender | |
| parent | f813a25224081e68d4772676909d2cff14407486 (diff) | |
| parent | 78eada5b6c3a8d20a2ea49887ab7c091e4b6fa14 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/llfontfreetype.cpp | 1 | ||||
| -rwxr-xr-x | indra/llrender/llrender.cpp | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 058bef43a5..84c782e958 100755 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -125,6 +125,7 @@ LLFontFreetype::~LLFontFreetype() // Delete glyph info std::for_each(mCharGlyphInfoMap.begin(), mCharGlyphInfoMap.end(), DeletePairedPointer()); + mCharGlyphInfoMap.clear(); // mFontBitmapCachep will be cleaned up by LLPointer destructor. // mFallbackFonts cleaned up by LLPointer destructor diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 0ac30b4d63..b481cf7095 100755 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -2196,7 +2196,15 @@ void LLRender::texCoord2fv(const GLfloat* tc) void LLRender::color4ub(const GLubyte& r, const GLubyte& g, const GLubyte& b, const GLubyte& a) { - mColorsp[mCount] = LLColor4U(r,g,b,a); + if (!LLGLSLShader::sCurBoundShaderPtr || + LLGLSLShader::sCurBoundShaderPtr->mAttributeMask & LLVertexBuffer::MAP_COLOR) + { + mColorsp[mCount] = LLColor4U(r,g,b,a); + } + else + { //not using shaders or shader reads color from a uniform + diffuseColor4ub(r,g,b,a); + } } void LLRender::color4ubv(const GLubyte* c) { |