From 1f773eeb99e375778849309d06ee0f0af4d5be75 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 13 Nov 2023 23:55:27 -0500
Subject: [PATCH] Fix sCull possibly being null
---
indra/newview/pipeline.cpp | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 99a792487c3..e4cc3193e16 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -10344,36 +10344,57 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar, bool preview_avatar, bool
bool LLPipeline::hasRenderBatches(const U32 type) const
{
+ if( !sCull )
+ return {};
+
return sCull->getRenderMapSize(type) > 0;
}
LLCullResult::drawinfo_iterator LLPipeline::beginRenderMap(U32 type)
{
+ if( !sCull )
+ return {};
+
return sCull->beginRenderMap(type);
}
LLCullResult::drawinfo_iterator LLPipeline::endRenderMap(U32 type)
{
+ if( !sCull )
+ return {};
+
return sCull->endRenderMap(type);
}
LLCullResult::sg_iterator LLPipeline::beginAlphaGroups()
{
+ if( !sCull )
+ return {};
+
return sCull->beginAlphaGroups();
}
LLCullResult::sg_iterator LLPipeline::endAlphaGroups()
{
+ if( !sCull )
+ return {};
+
return sCull->endAlphaGroups();
}
LLCullResult::sg_iterator LLPipeline::beginRiggedAlphaGroups()
{
+ if( !sCull )
+ return {};
+
return sCull->beginRiggedAlphaGroups();
}
LLCullResult::sg_iterator LLPipeline::endRiggedAlphaGroups()
{
+ if( !sCull )
+ return {};
+
return sCull->endRiggedAlphaGroups();
}
--
GitLab