Skip to content

Commit 2395b46

Browse files
committed
Merge pull request godotengine#90504 from smix8/sourcegeo_crash
Fix NavigationMeshSourceGeometryData merge crash
2 parents e911fcd + 497afea commit 2395b46

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

scene/resources/navigation_mesh_source_geometry_data_2d.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ void NavigationMeshSourceGeometryData2D::add_obstruction_outline(const PackedVec
120120
}
121121

122122
void NavigationMeshSourceGeometryData2D::merge(const Ref<NavigationMeshSourceGeometryData2D> &p_other_geometry) {
123+
ERR_FAIL_NULL(p_other_geometry);
124+
123125
// No need to worry about `root_node_transform` here as the data is already xformed.
124126
traversable_outlines.append_array(p_other_geometry->traversable_outlines);
125127
obstruction_outlines.append_array(p_other_geometry->obstruction_outlines);

scene/resources/navigation_mesh_source_geometry_data_3d.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ void NavigationMeshSourceGeometryData3D::add_faces(const PackedVector3Array &p_f
172172
}
173173

174174
void NavigationMeshSourceGeometryData3D::merge(const Ref<NavigationMeshSourceGeometryData3D> &p_other_geometry) {
175+
ERR_FAIL_NULL(p_other_geometry);
176+
175177
// No need to worry about `root_node_transform` here as the vertices are already xformed.
176178
const int64_t number_of_vertices_before_merge = vertices.size();
177179
const int64_t number_of_indices_before_merge = indices.size();

0 commit comments

Comments
 (0)