diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-05 08:04:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 08:04:04 +0200 |
| commit | 1c23a0cc7f879774f56404378db1bf86979e42d1 (patch) | |
| tree | 6bb19c61df0a3c7d603117a63ef46e19b58cdae4 | |
| parent | 2435d4bdb93c65465cfddd027bfaa02b9ca60c8d (diff) | |
| parent | 54c36adbec05a8e120f8e962a324eed4fc8e22ed (diff) | |
Merge pull request #38465 from madmiraal/fix-38457
Check for empty vectors before trying to access a pointer to the first element in Octree<T, use_pairs, AL>::cull_convex().
| -rw-r--r-- | core/math/octree.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/math/octree.h b/core/math/octree.h index 2060a61b4b..ffb405bd0f 100644 --- a/core/math/octree.h +++ b/core/math/octree.h @@ -1290,10 +1290,12 @@ void Octree<T, use_pairs, AL>::_cull_point(Octant *p_octant, const Vector3 &p_po template <class T, bool use_pairs, class AL> int Octree<T, use_pairs, AL>::cull_convex(const Vector<Plane> &p_convex, T **p_result_array, int p_result_max, uint32_t p_mask) { - if (!root) + if (!root || p_convex.size() == 0) return 0; Vector<Vector3> convex_points = Geometry::compute_convex_mesh_points(&p_convex[0], p_convex.size()); + if (convex_points.size() == 0) + return 0; int result_count = 0; pass++; |