From 26a2e4ba1e69fafac350ae2f1dd9be2ad8f4c0f6 Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Fri, 9 Aug 2019 20:46:38 +0300 Subject: SL-11614 Rotating objects flicker if Render type Avatar is disabled SL-1232 Derendering Avatar type also derenders some rezzed mesh objects SL-10357 [LOVE ME RENDER] Screen Artifacts in Specific Region(s) - Fixed --- indra/newview/pipeline.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/pipeline.cpp') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index a72244929e..63dc3f899e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1,4 +1,4 @@ -/** +/** * @file pipeline.cpp * @brief Rendering pipeline. * @@ -2396,7 +2396,7 @@ bool LLPipeline::getVisibleExtents(LLCamera& camera, LLVector3& min, LLVector3& static LLTrace::BlockTimerStatHandle FTM_CULL("Object Culling"); -void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_clip, LLPlane* planep) +void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_clip, LLPlane* planep, bool hud_attachments) { static LLCachedControl use_occlusion(gSavedSettings,"UseOcclusion"); static bool can_use_occlusion = LLGLSLShader::sNoFixedFunction @@ -2514,9 +2514,9 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl LLSpatialPartition* part = region->getSpatialPartition(i); if (part) { - if (hasRenderType(part->mDrawableType)) + if (!hud_attachments ? LLViewerRegion::PARTITION_BRIDGE == i || hasRenderType(part->mDrawableType) : hasRenderType(part->mDrawableType)) { - part->cull(camera); + part->cull(camera); } } } -- cgit v1.2.3