diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-09-10 17:47:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-10 17:47:20 +0200 |
commit | 43930aaa28c1e7c0e89af78d4a075a215d545ca6 (patch) | |
tree | d6b20d099f7fb4d1acdf243404bb23b718826202 | |
parent | e95a973045a29be7fe2305a661608e28f1325b71 (diff) | |
parent | 53e42930d9f0c0ae546f30b0f46cab7e5c094344 (diff) |
Merge pull request #41806 from AndreaCatania/AndreaCatania-patch-4
Avoid adding margin twice along capsule Y axis
-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 274493ed17..74d6e073b3 100644 --- a/modules/bullet/shape_bullet.cpp +++ b/modules/bullet/shape_bullet.cpp @@ -308,7 +308,7 @@ void CapsuleShapeBullet::setup(real_t p_height, real_t p_radius) { } btCollisionShape *CapsuleShapeBullet::internal_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 */ |