summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-09-03 11:43:08 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-09-03 11:43:08 +0200
commit032235b6fc04b867757fbaafe8ee946516a57584 (patch)
tree7469064e5ea80efc8c653f0b36b21787ae4df600
parentc282e17373f1ef9b36e2836cb2c8a2ef53c9cabf (diff)
parentb5fd29e7bc9aafb767215c6a7bb5177829466d23 (diff)
downloadredot-engine-032235b6fc04b867757fbaafe8ee946516a57584.tar.gz
Merge pull request #95503 from clayjohn/instance_none_crash
Avoid indexing instances without a base in scene cull phase
-rw-r--r--servers/rendering/renderer_scene_cull.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/servers/rendering/renderer_scene_cull.cpp b/servers/rendering/renderer_scene_cull.cpp
index 1d25dec633..286944641c 100644
--- a/servers/rendering/renderer_scene_cull.cpp
+++ b/servers/rendering/renderer_scene_cull.cpp
@@ -1783,6 +1783,8 @@ void RendererSceneCull::_update_instance(Instance *p_instance) {
if (p_instance->scenario) {
RendererSceneOcclusionCull::get_singleton()->scenario_set_instance(p_instance->scenario->self, p_instance->self, p_instance->base, *instance_xform, p_instance->visible);
}
+ } else if (p_instance->base_type == RS::INSTANCE_NONE) {
+ return;
}
if (!p_instance->aabb.has_surface()) {