diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-04-04 17:30:11 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-04-04 17:30:11 +0000 |
| commit | e4c281c134994a32cc006d7036aa811f9ed33799 (patch) | |
| tree | 7e40d7124351989dcf952d0bd3b1c02754080368 /indra/newview/pipeline.cpp | |
| parent | 7703ae3b1b6565694e59a6eef74c8ac9b0ddd158 (diff) | |
| parent | bfd2a594d746c552443a17c2857ed1f5bfcccd46 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #336)
SL-10887
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 96a66254ec..bd7c428559 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2446,7 +2446,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl LLVOCachePartition* vo_part = region->getVOCachePartition(); if(vo_part) { - bool do_occlusion_cull = can_use_occlusion && use_occlusion && !gUseWireframe/* && !gViewerWindow->getProgressView()->getVisible()*/; + bool do_occlusion_cull = can_use_occlusion && use_occlusion && !gUseWireframe && 0 > water_clip /* && !gViewerWindow->getProgressView()->getVisible()*/; vo_part->cull(camera, do_occlusion_cull); } } @@ -9276,7 +9276,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) S32 occlusion = LLPipeline::sUseOcclusion; //disable occlusion culling for reflection map for now - //LLPipeline::sUseOcclusion = 0; + LLPipeline::sUseOcclusion = 0; glh::matrix4f current = get_current_modelview(); |