summaryrefslogtreecommitdiffstats
path: root/scene/resources/navigation_mesh_source_geometry_data_3d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/resources/navigation_mesh_source_geometry_data_3d.cpp')
-rw-r--r--scene/resources/navigation_mesh_source_geometry_data_3d.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/resources/navigation_mesh_source_geometry_data_3d.cpp b/scene/resources/navigation_mesh_source_geometry_data_3d.cpp
index 1bd98fe1ac..39a17946fa 100644
--- a/scene/resources/navigation_mesh_source_geometry_data_3d.cpp
+++ b/scene/resources/navigation_mesh_source_geometry_data_3d.cpp
@@ -172,6 +172,8 @@ void NavigationMeshSourceGeometryData3D::add_faces(const PackedVector3Array &p_f
}
void NavigationMeshSourceGeometryData3D::merge(const Ref<NavigationMeshSourceGeometryData3D> &p_other_geometry) {
+ ERR_FAIL_NULL(p_other_geometry);
+
// No need to worry about `root_node_transform` here as the vertices are already xformed.
const int64_t number_of_vertices_before_merge = vertices.size();
const int64_t number_of_indices_before_merge = indices.size();