summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Admiraal <madmiraal@users.noreply.github.com>2020-05-04 21:02:58 +0100
committerMarcel Admiraal <madmiraal@users.noreply.github.com>2020-05-04 21:02:58 +0100
commit54c36adbec05a8e120f8e962a324eed4fc8e22ed (patch)
tree653fc85d7804785d56b1be268060a67e10612706
parentf7ca1c805ba2189627b49212ffbfba773f44acc5 (diff)
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.h4
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++;