summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2019-04-05 17:15:52 +0000
committerRider Linden <rider@lindenlab.com>2019-04-05 17:15:52 +0000
commitdde88112380939071a90dca502afaa4909f71201 (patch)
tree1e96b0d2e04269693aa2062e8a5214ce24078b27 /indra/newview
parentf6283ad141c8a6c0de18ee78023b002f1f8ec14d (diff)
parentf0fcbeff745a04d5a6d7188fb12ec46fdc79fd6b (diff)
Merged in graham_linden/viewer-eep-fixes (pull request #339)
SL-10748
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/pipeline.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index bd7c428559..260292d3fb 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -10282,6 +10282,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
//far_clip = llmin(far_clip, 128.f);
far_clip = llmin(far_clip, camera.getFar());
+ far_clip = llmax(far_clip, 256.0f);
F32 range = far_clip-near_clip;