summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-02-14 08:28:19 +0100
committerGitHub <noreply@github.com>2018-02-14 08:28:19 +0100
commit2a754be71aecbff9c2c924089840440802c3e565 (patch)
tree0e000dbe1bd75509a06f0baa749e2740ccd4fc91 /modules
parent232e03e5e377adbd3b86d04d15ef65b0f1778ebe (diff)
parentf48845428dcfe79edf381b1626e4ae7994fbdc96 (diff)
Merge pull request #16681 from AndreaCatania/kin_t
Added return true o collide when no rusult is NULL
Diffstat (limited to 'modules')
-rw-r--r--modules/bullet/space_bullet.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp
index 6f0cda8957..88d9c20eba 100644
--- a/modules/bullet/space_bullet.cpp
+++ b/modules/bullet/space_bullet.cpp
@@ -979,6 +979,8 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
} else {
if (!l_has_penetration)
break;
+ else
+ has_penetration = true;
}
}
}