diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-04-26 10:36:44 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-04-26 10:36:44 -0700 |
| commit | 9d314074c9e3c898436321bdb90d3bf0d10c0079 (patch) | |
| tree | e7eb0b1b16c8ea005f92181ae7b1da4b097c5dd8 | |
| parent | 250c8474914290aea0bb8edb8c3754ddd4a26f3e (diff) | |
SL-11055
Remove shader change to reduce additive to combat SL1491 as it also kills additive from foggy settings.
Zero out all cached hardware light colors causing uninit fun with class3 lighting.
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl index 246dd1a56d..94e776d51d 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl @@ -54,7 +54,7 @@ vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten) return light; } light *= atten.r; - light += additive * exp(-32.0f); + light += additive * exp(-1.0f); return light * 2.0; } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index b7c6d7817a..eb6a2edcec 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -408,6 +408,11 @@ LLPipeline::LLPipeline() : mNoiseMap = 0; mTrueNoiseMap = 0; mLightFunc = 0; + + for(U32 i = 0; i < 8; i++) + { + mHWLightColors[i] = LLColor4::black; + } } void LLPipeline::connectRefreshCachedSettingsSafe(const std::string name) |