summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRunitai Linden <davep@lindenlab.com>2020-03-04 16:38:37 -0600
committerRunitai Linden <davep@lindenlab.com>2020-03-04 16:38:37 -0600
commit265cefd2621a7d29e322ac903835bceb365f4f0a (patch)
tree0e23a4cc534202bb7478243c3f0bf3d1316a411c /indra/newview
parent40123cfc5390891217e97b66fa16962e7de686cd (diff)
Merge fix
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/materialF.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index 57e30c0ef3..ffd9dfed8c 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -349,7 +349,7 @@ void main()
color.rgb += sun_contrib;
#endif
- color.rgb *= diffuse_srgb.rgb;
+ color.rgb *= diffuse_linear.rgb;
float glare = 0.0;