From bfd2a594d746c552443a17c2857ed1f5bfcccd46 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Thu, 4 Apr 2019 10:27:43 -0700 Subject: SL-10887 Disable occlusion culling when rendering water reflection/refraction maps again (still getting probabalistic results for reflection map contents). :/ --- indra/newview/pipeline.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') 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(); -- cgit v1.2.3