diff options
| author | Marcel Admiraal <madmiraal@users.noreply.github.com> | 2020-10-08 16:19:34 +0100 |
|---|---|---|
| committer | Marcel Admiraal <madmiraal@users.noreply.github.com> | 2020-10-08 16:22:38 +0100 |
| commit | 0e12a0c66a2a602027080e292ec48651355a24e5 (patch) | |
| tree | 669a48281be6e54669153c5a6dfc0498a5268e67 | |
| parent | 53a3dfbf6b78cc3d0662abec4efa4bbeae4939f6 (diff) | |
Reapply -Avoid adding margin twice along capsule Y axis
Co-authored-by: Andrea Catania <info@andreacatania.com>
| -rw-r--r-- | modules/bullet/shape_bullet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/shape_bullet.cpp b/modules/bullet/shape_bullet.cpp index 340680c8d9..fdc2944dad 100644 --- a/modules/bullet/shape_bullet.cpp +++ b/modules/bullet/shape_bullet.cpp @@ -275,7 +275,7 @@ void CapsuleShapeBullet::setup(real_t p_height, real_t p_radius) { } btCollisionShape *CapsuleShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) { - return prepare(ShapeBullet::create_shape_capsule(radius * p_implicit_scale[0] + p_extra_edge, height * p_implicit_scale[1] + p_extra_edge)); + return prepare(ShapeBullet::create_shape_capsule(radius * p_implicit_scale[0] + p_extra_edge, height * p_implicit_scale[1])); } /* Cylinder */ |