diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2020-01-10 17:26:54 -0800 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2020-01-10 17:26:54 -0800 |
| commit | a471ddd0be09a7bd6815c09a98fc7acd87feac58 (patch) | |
| tree | da21b68caf1ca957e30806013cd00af9c3d1e1b6 | |
| parent | 391976ffb2a63782a49916bd26942dd71d9e6e62 (diff) | |
SL-12171: Fix for SL-12006 that made non-emissive portions of textures too dim.
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 2 |
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 f4e041eb5c..8ed5713e22 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -272,7 +272,7 @@ void main() #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_EMISSIVE) final_color.a = diffuse_linear.a; - final_color.rgb *= 0.5; + final_color.rgb = mix( diffuse_linear.rgb, final_color.rgb*0.5, diffuse_tap.a ); // SL-12171: Fix emissive texture portion being twice as bright. #endif final_color.a = max(final_color.a, emissive_brightness); |