summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2023-03-30 16:24:04 -0500
committerDave Parks <davep@lindenlab.com>2023-03-30 16:24:04 -0500
commit70bdf55439a57116cbd2c9bb32e78a8ada251d78 (patch)
treed187372ccc95cf99d3bcf29d2668e5d114ffa5a9 /indra
parente8114dbe14cc71664f6a27bbe727ff8c25fbc643 (diff)
SL-19517 Followup -- fix broken fallback probe. Adjust water brightness.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl2
-rw-r--r--indra/newview/llreflectionmapmanager.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
index ec7a2f4768..94c40b1fa0 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
@@ -676,7 +676,7 @@ void sampleReflectionProbesWater(inout vec3 ambenv, inout vec3 glossenv,
sampleReflectionProbes(ambenv, glossenv, tc, pos, norm, glossiness);
// fudge factor to get PBR water at a similar luminance ot legacy water
- glossenv *= 0.25;
+ glossenv *= 0.5;
}
void debugTapRefMap(vec3 pos, vec3 dir, float depth, int i, inout vec4 col)
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index 624eead68e..09ac7e57a4 100644
--- a/indra/newview/llreflectionmapmanager.cpp
+++ b/indra/newview/llreflectionmapmanager.cpp
@@ -1043,6 +1043,8 @@ void LLReflectionMapManager::initReflectionMaps()
{
is_free = true;
}
+
+ mCubeFree[0] = false;
}
if (mVertexBuffer.isNull())