Browse Source

Merge pull request #95503 from clayjohn/instance_none_crash

Avoid indexing instances without a base in scene cull phase
Rémi Verschelde 1 year ago
parent
commit
032235b6fc
1 changed files with 2 additions and 0 deletions
  1. 2 0
      servers/rendering/renderer_scene_cull.cpp

+ 2 - 0
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()) {