diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-04-03 22:42:40 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-04-03 22:42:40 +0000 |
| commit | 51cd9e7ddc3ae8a3bee814645a0993252ed61ab9 (patch) | |
| tree | dc3d0fa47707276907ea6ac8fc39f0ed15ec145a /indra/newview/app_settings/shaders | |
| parent | 8f1e75071e081f1040a371cb2c1bc420befab948 (diff) | |
| parent | a5d4edaccc292daa7c06267c55914762ec0f6ab8 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #332)
SL-10856
Diffstat (limited to 'indra/newview/app_settings/shaders')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl index f73fc0079b..800070c01d 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl @@ -66,8 +66,8 @@ void main() outColor = applyWaterFogView(pos.xyz, outColor); #endif - frag_data[0] = vec4(outColor.rgb, 1.0); - frag_data[1] = vec4(0.66,0.86,0.66,0.05f); + frag_data[0] = vec4(outColor.rgb, 0.0); + frag_data[1] = vec4(0.0,0.0,0.0,0.0); vec3 nvn = normalize(vary_normal); frag_data[2] = vec4(encode_normal(nvn.xyz), 0.0, 0.0); } diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 28248aaf6d..c34bac79dd 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -168,8 +168,6 @@ void main() col = fogged.rgb; bloom = fogged.a; #endif - -//col.rgb = a; } frag_color.rgb = col.rgb; frag_color.a = bloom; |