Age | Commit message (Collapse) | Author |
|
|
|
|
|
# Conflicts:
# indra/newview/llfloatermodelpreview.cpp
|
|
Appearance' mode
|
|
|
|
# Conflicts:
# indra/newview/llgroupmgr.cpp
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
|
|
Character lights injected during render pass while in character edit mode
(i.e. mSpecialRenderMode == 3) were causing discrepencies between deferred
(ALM) and forward alpha blend lighting.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit 4c006e76e39a8b59dc6f9c890e5a27d38b5ece50.
Since EEP there are no 'basic shaders' and doing this in llfloatersettingsdebug was wrong either way
|
|
Opaque water is not compatible with ALM
|
|
|
|
|
|
Fade out for deferred, fixed distance, reused non-deferred logic, fixed flicker
|
|
|
|
|
|
Merge
|
|
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
light color values inworld.
|
|
WRT light color values.
|
|
|
|
|
|
|
|
|
|
|
|
Remove checks for Vertex Shader capability and UI selection of no
Basic Shaders.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- Disable VAO for fixed pipeline + UI
|