summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-10-15 17:20:22 +0200
committerGitHub <noreply@github.com>2020-10-15 17:20:22 +0200
commit5971a97a0c5e535014ff940d8cf6a474b4860857 (patch)
tree3c6b44854759f99bb5db97fdbd5e7c26179a6db4
parente273f83be3d34a955bc831e6868d4c50a3a32d15 (diff)
parent0e12a0c66a2a602027080e292ec48651355a24e5 (diff)
Merge pull request #42649 from madmiraal/reapply-41806
Reapply -Avoid adding margin twice along capsule Y axis
-rw-r--r--modules/bullet/shape_bullet.cpp2
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 */