livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-11543, SL-11443 

Fix faullbright/emissive problems.
meow-7.2.2
Graham Linden 2019-09-03 15:57:49 -07:00
parent bfcecee33d
commit 16933b0ab9
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
View File

@ -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
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
vec4 final_specular = spec;
final_specular.a = specular_color.a;
#if HAS_SPECULAR_MAP
final_specular.a *= norm.a;
final_normal.z *= spec.a;
#endif