diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
| commit | a1c2d021261d38de7dabd0863dd264ac3bf50523 (patch) | |
| tree | 3b09e4412ccac313dd93adff2d14d1c766b5686a /indra/newview/lldrawpoolavatar.cpp | |
| parent | c8d8414b3b2e83fbaffd6e48f55ca14a3cb27ca4 (diff) | |
| parent | 0a7bc35335666cc310ef900d4e4144c658b92522 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #273)
SL-10478, SL-10486, SL-10501, SL-10415, SL-10487
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index eaf5b7dd68..3e1d78e6df 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1999,15 +1999,24 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow) if (face->mTextureMatrix && vobj->mTexAnimMode) { - gGL.matrixMode(LLRender::MM_TEXTURE); - gGL.loadMatrix((F32*) face->mTextureMatrix->mMatrix); + U32 tex_index = gGL.getCurrentTexUnitIndex(); + if (tex_index <= 1) + { + gGL.matrixMode(LLRender::MM_TEXTURE); + gGL.loadMatrix((F32*) face->mTextureMatrix->mMatrix); + } + else + { + LL_WARNS_ONCE("render") << "Cannot use tex anim of tex index " << tex_index << " ignoring!" << LL_ENDL; + } buff->setBuffer(data_mask); buff->drawRange(LLRender::TRIANGLES, start, end, count, offset); - gGL.matrixMode(LLRender::MM_TEXTURE); - gGL.loadIdentity(); - + if (tex_index <= 1) + { + gGL.loadIdentity(); + } } else { |