diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-28 16:26:20 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-28 16:26:20 -0500 |
| commit | 969aa248a4c398dd0608a447f99cf74683d09f65 (patch) | |
| tree | 2324ed739146db02597a27e186b7d3841c2d45fd /indra/llrender/llrender.cpp | |
| parent | 735708583fc6e236df3ad6d4c9a5f02b6ec7605a (diff) | |
SH-2633 Fix for avatar hair turning white when editing appearance
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index afb19fce55..97aeae548a 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1142,16 +1142,6 @@ void LLRender::syncMatrices() { stop_glerror(); - GLenum mode[] = - { - GL_MODELVIEW, - GL_PROJECTION, - GL_TEXTURE, - GL_TEXTURE, - GL_TEXTURE, - GL_TEXTURE, - }; - U32 name[] = { LLShaderMgr::MODELVIEW_MATRIX, @@ -1272,6 +1262,16 @@ void LLRender::syncMatrices() } else if (!LLGLSLShader::sNoFixedFunction) { + GLenum mode[] = + { + GL_MODELVIEW, + GL_PROJECTION, + GL_TEXTURE, + GL_TEXTURE, + GL_TEXTURE, + GL_TEXTURE, + }; + for (U32 i = 0; i < 2; ++i) { if (mMatHash[i] != mCurMatHash[i]) |