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

Merge remote-tracking branch 'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q

master
Andrey Lihatskiy 2022-11-09 00:45:01 +02:00
parent 2904062948 520ebb392b
commit 55c27641fe
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -282,6 +282,7 @@ Beq Janus
SL-11300
SL-15709
SL-16021
SL-18592
Beth Walcher
Bezilon Kasei
Biancaluce Robbiani

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

@ -227,7 +227,7 @@ void main()
vec4 diffcol = texture2D(diffuseMap, vary_texcoord0.xy);
diffcol.rgb *= vertex_color.rgb;
#ifdef HAS_ALPHA_MASK
#if HAS_ALPHA_MASK && (DIFFUSE_ALPHA_MODE != DIFFUSE_ALPHA_MODE_EMISSIVE)
#if DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND
if (diffcol.a*vertex_color.a < minimum_alpha)
#else