summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class2
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2020-03-06 19:55:06 +0000
committerDave Parks <davep@lindenlab.com>2020-03-06 19:55:06 +0000
commitce8bf1a3f303eb5af2c61f620845d124b022795a (patch)
treeb1409e0e4756e2ed9408d0eefc044cd4c491f721 /indra/newview/app_settings/shaders/class2
parentfd043095c6d5c3f5b065322c6c9332a7170e3d0a (diff)
parenta3759b4910b94b3a375e16e605dc1a4f096f2256 (diff)
Merged in davep/BUG-228263 (pull request #24)
Fix for sky in wrong color space.
Diffstat (limited to 'indra/newview/app_settings/shaders/class2')
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 9ebacd59c7..6f5b0981f9 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -162,7 +162,7 @@ vec3 post_diffuse = color.rgb;
vec3 post_spec = color.rgb;
- color.rgb = mix(color.rgb, diffuse_linear.rgb, diffuse_linear.a);
+ color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a);
if (envIntensity > 0.0)
{ //add environmentmap