diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2019-12-11 23:02:24 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2019-12-11 23:02:24 +0000 |
| commit | bc06a9acf91035903d497bdd66e9bb26859616be (patch) | |
| tree | 9dff2a47151271ba250b78d320061d77bf608bd1 /indra | |
| parent | 9872b8a1d0954cce2813f71166fa13978e283002 (diff) | |
| parent | 05e54ac96be519e5f60f2681ac3226dab7dcb8b2 (diff) | |
Merged in ptolemy_linden/ptolemy-viewer-eep (pull request #507)
SL-11406: Skip avatars being effected.
Approved-by: Dave Houlton <euclid@lindenlab.com>
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index c23314a4b9..52c69b46ea 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -292,8 +292,12 @@ void main() // We remap the environment intensity to closely simulate what non-EEP is doing. // At midnight the brightness is exact. // At midday the brightness is very close. +#ifdef HAS_SKIN + vec4 final_normal = vec4(abnormal, env_intensity, 0.0); +#else float ei = env_intensity*0.5 + 0.5; vec4 final_normal = vec4(abnormal, ei, 0.0); +#endif vec4 final_specular = spec; final_specular.a = specular_color.a; |