diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-01 13:41:31 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-01 13:41:31 -0800 |
| commit | 5a8610ccb7e1f5a0e4d54170ac922e6820ce3acb (patch) | |
| tree | 13af4da0c897474ca41d7c797b15fe3148ad6ada /indra/newview/lldrawpoolavatar.cpp | |
| parent | 6716e543a160dd50913309834e7bd2d00034854c (diff) | |
SL-9996, SL-1130, SL-5546
Fix bug with setting texture matrix for rigged mesh.
Fix z-fighting between sea and sky in ALM by cheating sky, stars, and moon using gl_FragDepth.
Fix handling of atmospheric haze glow w.r.t independent sun/moon positioning
(we can no longer depend on them being mutex to each other).
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 996c7eed4b..eaf5b7dd68 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -2001,10 +2001,13 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow) { gGL.matrixMode(LLRender::MM_TEXTURE); gGL.loadMatrix((F32*) face->mTextureMatrix->mMatrix); + buff->setBuffer(data_mask); buff->drawRange(LLRender::TRIANGLES, start, end, count, offset); + + gGL.matrixMode(LLRender::MM_TEXTURE); gGL.loadIdentity(); - gGL.matrixMode(LLRender::MM_MODELVIEW); + } else { |