diff options
author | Juan Linietsky <reduzio@gmail.com> | 2017-11-09 16:08:58 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-09 16:08:58 -0300 |
commit | 50a9bd4e23e62579e2249de3c27624d6c56df1d0 (patch) | |
tree | a0595c5872054a9d4fe50bc5446cea5518b5f8b0 /modules/bullet/collision_object_bullet.cpp | |
parent | 881defa209435816f52b08edfd876159592e830a (diff) | |
parent | 10f879bf883ed364a9b0eafe40aba03c59b6fbfb (diff) | |
download | redot-engine-50a9bd4e23e62579e2249de3c27624d6c56df1d0.tar.gz |
Merge pull request #12713 from AndreaCatania/master
Rewritten kinematic system
Diffstat (limited to 'modules/bullet/collision_object_bullet.cpp')
-rw-r--r-- | modules/bullet/collision_object_bullet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/collision_object_bullet.cpp b/modules/bullet/collision_object_bullet.cpp index 769e2c943e..91a049b1f3 100644 --- a/modules/bullet/collision_object_bullet.cpp +++ b/modules/bullet/collision_object_bullet.cpp @@ -105,7 +105,7 @@ void CollisionObjectBullet::remove_collision_exception(const CollisionObjectBull } bool CollisionObjectBullet::has_collision_exception(const CollisionObjectBullet *p_otherCollisionObject) const { - return !bt_collision_object->checkCollideWithOverride(p_otherCollisionObject->bt_collision_object); + return !bt_collision_object->checkCollideWith(p_otherCollisionObject->bt_collision_object); } void CollisionObjectBullet::set_collision_enabled(bool p_enabled) { |