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/lldrawpoolwater.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/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index c674d9a576..23749d7adb 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -592,6 +592,7 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li shader->uniform1f(LLShaderMgr::WATER_SUN_ANGLE, sunAngle); shader->uniform1f(LLShaderMgr::WATER_SCALED_ANGLE, scaledAngle); shader->uniform1f(LLShaderMgr::WATER_SUN_ANGLE2, 0.1f + 0.2f*sunAngle); + shader->uniform1i(LLShaderMgr::WATER_EDGE_FACTOR, edge ? 1 : 0); LLColor4 water_color; LLVector3 camera_up = LLViewerCamera::getInstance()->getUpAxis(); |