diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-10-25 19:29:36 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-10-25 19:29:36 +0300 |
| commit | 62ce96a77b4305ead8fdde7644805b1cbf069597 (patch) | |
| tree | dec29b4f963225c045d615dab28db775ade3cd22 /indra/newview/pipeline.cpp | |
| parent | 05a3ea99765c767f74bf4ceac3bca39a326be4bf (diff) | |
Backed out changeset: cb9915554e9f (SL-1232/SL-11614)
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index ad8a24ca96..4647e7e84e 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, bool hud_attachments) +void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_clip, LLPlane* planep) { static LLCachedControl<bool> 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 (!hud_attachments ? LLViewerRegion::PARTITION_BRIDGE == i || hasRenderType(part->mDrawableType) : hasRenderType(part->mDrawableType)) + if (hasRenderType(part->mDrawableType)) { - part->cull(camera); + part->cull(camera); } } } |