| Age | Commit message (Collapse) | Author | 
 | 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
 | 
 | 
original fix by Beq Janus
 | 
 | 
'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q
 | 
 | 
This is the most local fix for this issue, addressing the specific unqualified use of HAS_ALPHA_MASK.
If we find other issues with alpha mask being applied incorrectly then, it may be better to fix higher up in llvieweshadermgr.cpp by reverting the changes from SL-17532. 
For now, this way works for this specific bug without non-emissive side-effects.
 | 
 | 
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
 | 
 | 
 | 
 | 
shader and remove redundant and slow class2 version.
# Conflicts:
#	indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
 | 
 | 
 | 
 | 
before alpha masking (we don't actually support this and the vertex color alpha is sometimes zero when you think it ought not be).
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
attachments rendering to depth buffer)
 | 
 | 
 | 
 | 
 | 
 | 
removal of glow-only rigged meshes from depth buffer.
 | 
 | 
 | 
 | 
 | 
 | 
rigged meshes.
 | 
 | 
 | 
 | 
support to highlight transparent).
 | 
 | 
textures
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
# Conflicts:
#	doc/contributions.txt
 | 
 | 
space for accurate color reproduction of sun textures
 | 
 | 
dim in EEP
 | 
 | 
 | 
 | 
 | 
 | 
Contribution
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Removed some potential div-by-0 NaNs and a mangled clamp.
 | 
 | 
 | 
 | 
 | 
 | 
original fall-off.
Had to find a balance in the sunlight intensity calculation that behaves correctly for
both these issues.
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 |