Merged in graham_linden/viewer-eep-fixes (pull request #274)

SL-10457, SL-10414

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/shadowUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/shadowUtil.glsl
index e762871ba1..d04ac6851a 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/shadowUtil.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/shadowUtil.glsl
@@ -151,13 +151,16 @@ float sampleDirectionalShadow(vec3 pos, vec3 norm, vec2 pos_screen)
 
         shadow /= weight;
     }
-
+    else
+    {
+        return 1.0f; // lit beyond the far split...
+    }
     return shadow;
 }
 
 float sampleSpotShadow(vec3 pos, vec3 norm, int index, vec2 pos_screen)
 {
-    float shadow = 0.0f;
+    float shadow = 1.0f;
     pos += norm * spot_shadow_offset;
 
     vec4 spos = vec4(pos,1.0);