summaryrefslogtreecommitdiffstats
path: root/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-09-03 16:13:55 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-09-03 16:13:55 +0200
commitd15de6f264bc3659310c19bc402a432e2ea896e3 (patch)
treedeb293154752257941ca8852de4eec167ff9d3b7 /scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
parentb104f218410669ec81ec9ffd4d8833b8aa30a554 (diff)
parent194bdde94787227e8f53a4e3273c192ab70b03ac (diff)
downloadredot-engine-d15de6f264bc3659310c19bc402a432e2ea896e3.tar.gz
Merge pull request #96292 from AThousandShips/null_check_ref_fix
Cleanup of raw `nullptr` checks with `Ref`
Diffstat (limited to 'scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp')
-rw-r--r--scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp b/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
index c55e25fcae..59366592ce 100644
--- a/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
+++ b/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
@@ -223,7 +223,7 @@ void NavigationMeshSourceGeometryData3D::add_faces(const PackedVector3Array &p_f
}
void NavigationMeshSourceGeometryData3D::merge(const Ref<NavigationMeshSourceGeometryData3D> &p_other_geometry) {
- ERR_FAIL_NULL(p_other_geometry);
+ ERR_FAIL_COND(p_other_geometry.is_null());
Vector<float> other_vertices;
Vector<int> other_indices;