diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-07-03 10:04:05 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-07-03 10:04:05 -0700 |
| commit | 48f169423ba0c1da8ffe13fc8bc4cec76336d8fc (patch) | |
| tree | b98913a1c97fa68a5e7d892839c01b1db34c4e15 /indra/newview/app_settings/shaders/class1/environment | |
| parent | 7e5000bb64ca8eea3fe188ebb7bccff3bdfa82e7 (diff) | |
SL-11545, SL-11543, SL-10625
Fix emissives without normal maps clobbering the alpha output in materialF.
Modify glow size calc to get close to pre-EEP sun glow behavior (may require sky vert settings >= mid).
Make bake ignore alpha readback for Intel until we can determine why their drivers now go boom.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/environment')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/environment/terrainWaterV.glsl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/environment/terrainWaterV.glsl b/indra/newview/app_settings/shaders/class1/environment/terrainWaterV.glsl index 416d406f68..a075cfeef2 100644 --- a/indra/newview/app_settings/shaders/class1/environment/terrainWaterV.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/terrainWaterV.glsl @@ -70,10 +70,6 @@ void main() vec4 color = calcLighting(pos.xyz, norm, vec4(1.0)); -#if defined(ALM) - color.rgb *= 0.5f; -#endif - vertex_color.rgb = color.rgb; // Transform and pass tex coords |