diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-12 08:50:54 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-12 08:50:54 +0200 |
| commit | 16edce0cc242831062e1e1630e33146a003280a9 (patch) | |
| tree | 8b66ccffc154ffb6cf0677f4152eea9f633c1061 | |
| parent | 2cbd850979ac6d260f15a1e62f7b0a89e7a16b4d (diff) | |
| parent | d239e6bc0ebf7ac987f2c1991a5dceb33ad2a8f2 (diff) | |
Merge pull request #4287 from Zylann/fix_4163
Fixed #4163 (intersect_shape crashes on results limit)
| -rw-r--r-- | servers/physics_2d/space_2d_sw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_2d/space_2d_sw.cpp b/servers/physics_2d/space_2d_sw.cpp index 027e218bfc..d83efeea9c 100644 --- a/servers/physics_2d/space_2d_sw.cpp +++ b/servers/physics_2d/space_2d_sw.cpp @@ -198,7 +198,7 @@ int Physics2DDirectSpaceStateSW::intersect_shape(const RID& p_shape, const Matri Rect2 aabb = p_xform.xform(shape->get_aabb()); aabb=aabb.grow(p_margin); - int amount = space->broadphase->cull_aabb(aabb,space->intersection_query_results,Space2DSW::INTERSECTION_QUERY_MAX,space->intersection_query_subindex_results); + int amount = space->broadphase->cull_aabb(aabb,space->intersection_query_results,p_result_max,space->intersection_query_subindex_results); bool collided=false; int cc=0; |