diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-09-03 15:57:49 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-09-03 15:57:49 -0700 |
| commit | 16933b0ab9a8556467fba18790050f2d025d06a5 (patch) | |
| tree | 75a43a33184d4c4a1a2df2f40da22f8c4119a7c4 /indra/newview | |
| parent | bfcecee33d01c67141dfbb5d70c7a744ca0f47b5 (diff) | |
SL-11543, SL-11443
Fix faullbright/emissive problems.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index 023172c844..fafecd57cc 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -274,20 +274,16 @@ void main() #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_EMISSIVE) final_color.a = diffuse_linear.a; #endif - final_color.a = max(final_color.a, emissive_brightness); -#if !defined(HAS_NORMAL_MAP) - final_color.a = 0.0f; -#endif + final_color.a = max(final_color.a, emissive_brightness); + vec4 final_normal = vec4(encode_normal(normalize(tnorm)), env_intensity, 0.0); vec4 final_specular = spec; + final_specular.a = specular_color.a; -#ifdef HAS_SPECULAR_MAP - final_specular.a *= norm.a; -#endif - vec4 final_normal = vec4(encode_normal(normalize(tnorm)), env_intensity, 0.0); -#ifdef HAS_SPECULAR_MAP +#if HAS_SPECULAR_MAP + final_specular.a *= norm.a; final_normal.z *= spec.a; #endif |