diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-21 18:05:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-21 18:05:02 +0200 |
| commit | 858af3d3b96bd0d27158b5a3c01fabe59bbe015a (patch) | |
| tree | 4ea044645e52a78e55c8558b482e0bd4e76b5d1f /servers/physics_server_3d.cpp | |
| parent | fd21465ec309cb84cd262c110fe59d8060c37f82 (diff) | |
| parent | 8ffe905c455eaa33394dafe67858df12d767fc27 (diff) | |
Merge pull request #34219 from madmiraal/check-motion-before-bullet-sweep
Check for motion in cast_motion() before doing Bullet convexSweepTest().
Diffstat (limited to 'servers/physics_server_3d.cpp')
| -rw-r--r-- | servers/physics_server_3d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_server_3d.cpp b/servers/physics_server_3d.cpp index 2dd8ea3edb..9668358710 100644 --- a/servers/physics_server_3d.cpp +++ b/servers/physics_server_3d.cpp @@ -295,7 +295,7 @@ Array PhysicsDirectSpaceState3D::_intersect_shape(const Ref<PhysicsShapeQueryPar Array PhysicsDirectSpaceState3D::_cast_motion(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query, const Vector3 &p_motion) { ERR_FAIL_COND_V(!p_shape_query.is_valid(), Array()); - float closest_safe, closest_unsafe; + float closest_safe = 1.0f, closest_unsafe = 1.0f; bool res = cast_motion(p_shape_query->shape, p_shape_query->transform, p_motion, p_shape_query->margin, closest_safe, closest_unsafe, p_shape_query->exclude, p_shape_query->collision_mask, p_shape_query->collide_with_bodies, p_shape_query->collide_with_areas); if (!res) { return Array(); |