summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2019-04-02 01:28:57 -0700
committerGeenz <geenz@geenzo.com>2019-04-02 01:28:57 -0700
commitf07a1741e91fe44423d27585e4eeb7b69542e299 (patch)
treea826d078d77d689aae6734eb475728a4935b6318 /indra/newview/app_settings/shaders/class1
parent6b54c48dff9a38a0a1410ed9bcd06d2667320df3 (diff)
Make sure emissive is actually handled with atmospherics consistently.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl6
1 files changed, 4 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 cbeab3fc72..2df55f6cfc 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -145,8 +145,10 @@ void main()
if (norm.w < 0.5)
{
- col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a);
- col = mix(scaleSoftClip(col), fullbrightScaleSoftClip(col), diffuse.a);
+ //col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a);
+ //col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col, additive, atten), diffuse.a);
+ col = atmosFragLighting(col, additive, atten);
+ col = scaleSoftClipFrag(col);
}
#ifdef WATER_FOG