diff options
| author | Geenz <geenz@geenzo.com> | 2019-03-29 10:55:07 -0700 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2019-03-29 10:55:07 -0700 |
| commit | f3ea75cfa903f5dedc01930a50312049f4207e46 (patch) | |
| tree | fd6f368c8155c6d4a88317b2fce83111f947cf6e /indra/newview | |
| parent | 4e86079008761b025f848a5d9977823d3a27e92d (diff) | |
Back out a couple of not-so-well tested changes.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index 7f59852b62..f674766935 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -503,12 +503,7 @@ void LLDrawPoolWLSky::renderHeavenlyBodies() LLColor4 color(gSky.mVOSkyp->getSun().getInterpColor()); - if (LLPipeline::RenderDeferred) { - sun_shader->uniform4fv(LLShaderMgr::DIFFUSE_COLOR, 1, srgbColor4(color).mV); - } - else { - sun_shader->uniform4fv(LLShaderMgr::DIFFUSE_COLOR, 1, color.mV); - } + sun_shader->uniform4fv(LLShaderMgr::DIFFUSE_COLOR, 1, color.mV); sun_shader->uniform1f(LLShaderMgr::BLEND_FACTOR, blend_factor); LLFacePool::LLOverrideFaceColor color_override(this, color); @@ -559,15 +554,8 @@ void LLDrawPoolWLSky::renderHeavenlyBodies() F32 moon_brightness = (float)psky->getMoonBrightness(); moon_shader->uniform1f(LLShaderMgr::MOON_BRIGHTNESS, moon_brightness); - - if (LLPipeline::RenderDeferred) { - moon_shader->uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, 1, srgbColor4(gSky.mVOSkyp->getMoon().getColor()).mV); - moon_shader->uniform4fv(LLShaderMgr::DIFFUSE_COLOR, 1, srgbColor4(color).mV); - } - else { - moon_shader->uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, 1, gSky.mVOSkyp->getMoon().getColor().mV); - moon_shader->uniform4fv(LLShaderMgr::DIFFUSE_COLOR, 1, color.mV); - } + moon_shader->uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, 1, gSky.mVOSkyp->getMoon().getColor().mV); + moon_shader->uniform4fv(LLShaderMgr::DIFFUSE_COLOR, 1, color.mV); moon_shader->uniform1f(LLShaderMgr::BLEND_FACTOR, blend_factor); LLFacePool::LLOverrideFaceColor color_override(this, color); |