summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2019-04-18 16:26:29 +0000
committerRider Linden <rider@lindenlab.com>2019-04-18 16:26:29 +0000
commit2684b301687f1f226834eaae0c25482e65cbf9ca (patch)
treeedc012edb5f1a8331e30e9d8d16a2b83704b44bb /indra/newview
parent83e0af9f95c39b1385cd63df46874b040a408af6 (diff)
parentd2419ca3ca5e2cfe321e350e48df31b41d82c605 (diff)
Merged in graham_linden/viewer-eep-rc-fixes (pull request #356)
SL-10988
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lldrawpoolwlsky.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp
index a3aa0e289f..b9bc7678e6 100644
--- a/indra/newview/lldrawpoolwlsky.cpp
+++ b/indra/newview/lldrawpoolwlsky.cpp
@@ -528,7 +528,7 @@ void LLDrawPoolWLSky::renderHeavenlyBodies()
LLColor4 color(gSky.mVOSkyp->getMoon().getInterpColor());
- if (can_use_vertex_shaders && can_use_windlight_shaders)
+ if (can_use_vertex_shaders && can_use_windlight_shaders && (tex_a || tex_b))
{
moon_shader->bind();