summaryrefslogtreecommitdiffstats
path: root/scene/resources/navigation_mesh_source_geometry_data_2d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/resources/navigation_mesh_source_geometry_data_2d.cpp')
-rw-r--r--scene/resources/navigation_mesh_source_geometry_data_2d.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/resources/navigation_mesh_source_geometry_data_2d.cpp b/scene/resources/navigation_mesh_source_geometry_data_2d.cpp
index dfa3b598c8..d613b498a1 100644
--- a/scene/resources/navigation_mesh_source_geometry_data_2d.cpp
+++ b/scene/resources/navigation_mesh_source_geometry_data_2d.cpp
@@ -120,6 +120,8 @@ void NavigationMeshSourceGeometryData2D::add_obstruction_outline(const PackedVec
}
void NavigationMeshSourceGeometryData2D::merge(const Ref<NavigationMeshSourceGeometryData2D> &p_other_geometry) {
+ ERR_FAIL_NULL(p_other_geometry);
+
// No need to worry about `root_node_transform` here as the data is already xformed.
traversable_outlines.append_array(p_other_geometry->traversable_outlines);
obstruction_outlines.append_array(p_other_geometry->obstruction_outlines);