diff options
| author | Dave Parks <davep@lindenlab.com> | 2020-03-06 19:55:06 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2020-03-06 19:55:06 +0000 |
| commit | ce8bf1a3f303eb5af2c61f620845d124b022795a (patch) | |
| tree | b1409e0e4756e2ed9408d0eefc044cd4c491f721 | |
| parent | fd043095c6d5c3f5b065322c6c9332a7170e3d0a (diff) | |
| parent | a3759b4910b94b3a375e16e605dc1a4f096f2256 (diff) | |
Merged in davep/BUG-228263 (pull request #24)
Fix for sky in wrong color space.
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index 54abd56625..1acb8d08eb 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -154,7 +154,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 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 |