diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-04-04 11:48:03 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-04-04 11:48:03 -0700 |
| commit | 6d756c53376cfc12feea75d145e28b5c02c9944a (patch) | |
| tree | 576d87971fe7bd1d41fdb5c1d22bcaadbc43c2a1 /indra | |
| parent | dfdeeb353ce20294ff87190fc95313a81581bd49 (diff) | |
| parent | e4c281c134994a32cc006d7036aa811f9ed33799 (diff) | |
Merge
Diffstat (limited to 'indra')
| -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(); |