livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19569 Don't reset probes when crossing parcel borders (whoops) and tone down glare on legacy materials.

meow-7.2.2
RunitaiLinden 2023-04-12 13:44:41 -05:00
parent 84fb05efeb
commit 63c5711914
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
View File

@ -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;
}

3
indra/newview/llenvironment.cpp
View File

@ -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);
}

3
indra/newview/llviewermenu.cpp
View File

@ -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();