diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-04 11:21:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 11:21:49 +0200 |
| commit | e1fef9bd76ab2fbf7361754165728b9dcb69099b (patch) | |
| tree | d7f193a56a77691c030bf320bc8a2b3e0d8f65d3 /modules/bullet/space_bullet.cpp | |
| parent | 950d4922a5ace3d0fe910ea702f8db8e39b1c78f (diff) | |
| parent | b050525072af1d6fa94eeaf98e13669e9ebc872d (diff) | |
| download | redot-engine-e1fef9bd76ab2fbf7361754165728b9dcb69099b.tar.gz | |
Merge pull request #17959 from AndreaCatania/kinfix2
Fixed kinematic sliding on trimesh
Diffstat (limited to 'modules/bullet/space_bullet.cpp')
| -rw-r--r-- | modules/bullet/space_bullet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp index ab711fa6b9..51a76ff8c5 100644 --- a/modules/bullet/space_bullet.cpp +++ b/modules/bullet/space_bullet.cpp @@ -1120,7 +1120,7 @@ bool SpaceBullet::RFP_convex_world_test(const btConvexShape *p_shapeA, const btC dispatcher->freeCollisionAlgorithm(algorithm); if (contactPointResult.hasHit()) { - r_delta_recover_movement += contactPointResult.m_pointNormalWorld * (contactPointResult.m_penetration_distance * p_recover_movement_scale); + r_delta_recover_movement += contactPointResult.m_pointNormalWorld * (contactPointResult.m_penetration_distance * -1 * p_recover_movement_scale); if (r_recover_result) { if (contactPointResult.m_penetration_distance < r_recover_result->penetration_distance) { |