diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-05 20:20:43 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-05 20:20:43 +0100 |
| commit | b6b9094d26933c41cc917901fcf4847275ff4ca5 (patch) | |
| tree | 4a90db33930b4a8bb1426513f0847a23a1b5e390 | |
| parent | 6b7f624a4b7dd11e03cd9b6ed96d61881e121a37 (diff) | |
Fix sunlight != sunlight_color_copy and remove hack disable of clouds.
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 1eb1cb56a8..fd187b99ee 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1150,7 +1150,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("cloud_noise_texture"); mReservedUniforms.push_back("fullbright"); mReservedUniforms.push_back("lightnorm"); - mReservedUniforms.push_back("sunlight_color_copy"); + mReservedUniforms.push_back("sunlight_color"); mReservedUniforms.push_back("ambient"); mReservedUniforms.push_back("blue_horizon"); mReservedUniforms.push_back("blue_density"); diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index def81e46fc..c6abba95bc 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -285,7 +285,7 @@ void LLDrawPoolWLSky::renderSkyClouds(const LLVector3& camPosLocal, F32 camHeigh cloud_shader->bind(); /// Render the skydome -//renderDome(camPosLocal, camHeightLocal, cloud_shader); + renderDome(camPosLocal, camHeightLocal, cloud_shader); cloud_shader->unbind(); } |