diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2020-03-06 17:20:46 -0800 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2020-03-06 17:20:46 -0800 |
| commit | d32821ea5bf17c4de47b9ee03b43a20ae278dfe4 (patch) | |
| tree | d335dbc6ff34f8b881c1ca55a47e485d8e79aded /indra/newview/app_settings/shaders/class1/lighting | |
| parent | 3c5888e325fb4b450e6ed7f40d10c58cad348c1c (diff) | |
SL-12574 Fix EEP cubemap not matching non-EEP for both ALM on and off
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl index 64ecf1f392..567811cd75 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl @@ -44,7 +44,7 @@ void fullbright_shiny_lighting() color.rgb *= vertex_color.rgb; vec3 envColor = textureCube(environmentMap, vary_texcoord1.xyz).rgb; - color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a); + color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a*0.75); // MAGIC NUMBER SL-12574; ALM: Off, Quality > Low color.rgb = fullbrightShinyAtmosTransport(color.rgb); diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl index 5bbd71002d..f621a00785 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl @@ -45,7 +45,7 @@ void shiny_lighting() color.rgb *= vertex_color.rgb; vec3 envColor = textureCube(environmentMap, vary_texcoord1.xyz).rgb; - color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a); + color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a*0.75); // MAGIC NUMBER SL-12574; ALM: Off, Quality > Low color.rgb = atmosLighting(color.rgb); |