diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-03-10 22:40:59 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-03-10 22:40:59 +0000 |
| commit | 1b8dab78a88cc83e9cd76287bfeea6deb086c8b3 (patch) | |
| tree | 7f3f1161f97037da779422190f69f30e4822ddb6 /indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | |
| parent | 40526d548953a06a432bab4cd59af7949440f7c6 (diff) | |
| parent | b1e2615cd80f27dac6712995edcc890df021041a (diff) | |
Merged in SL-12171_srgb_linear_fix (pull request #29)
SL-12171 Fix emissive mask being too bright post sRGB/Linear cleanup
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/materialF.glsl')
| -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 21a462e2db..5999063ae5 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -254,7 +254,7 @@ void main() vec4 final_color = vec4(diffuse_linear.rgb, 0.0); #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_EMISSIVE) - final_color.a = diffuse_linear.a; + final_color.a = diffuse_linear.a * 0.5; // SL-12171 #endif final_color.a = max(final_color.a, emissive_brightness); |