diff options
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/materialF.glsl | 3 | ||||
| -rw-r--r-- | indra/newview/llenvironment.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl index 62bb09e94b..e5341386bd 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl @@ -411,7 +411,8 @@ void main() applyLegacyEnv(color, legacyenv, spec, pos.xyz, norm.xyz, env); float cur_glare = max(max(legacyenv.r, legacyenv.g), legacyenv.b); - cur_glare *= env*4.0; + cur_glare = clamp(cur_glare, 0, 1); + cur_glare *= env; glare += cur_glare; } diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 829cd7cf7b..627842079e 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -1361,9 +1361,6 @@ void LLEnvironment::clearEnvironment(LLEnvironment::EnvSelection_t env) mEnvironments[env].reset(); - // reset probe data when reverting back to region sky setting - gPipeline.mReflectionMapManager.reset(); - if (!mSignalEnvChanged.empty()) mSignalEnvChanged(env, VERSION_CLEANUP); } diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index e8b9a22c60..25efe189cb 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8918,6 +8918,9 @@ class LLWorldEnvSettings : public view_listener_t } else if (event_name == "region") { + // reset probe data when reverting back to region sky setting + gPipeline.mReflectionMapManager.reset(); + LLEnvironment::instance().clearEnvironment(LLEnvironment::ENV_LOCAL); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::TRANSITION_INSTANT); defocusEnvFloaters(); |