summaryrefslogtreecommitdiff
path: root/modules/bullet/collision_object_bullet.cpp
diff options
context:
space:
mode:
authorAndreaCatania <info@andreacatania.com>2017-11-07 15:22:09 +0100
committerAndreaCatania <info@andreacatania.com>2017-11-07 15:22:09 +0100
commit10f879bf883ed364a9b0eafe40aba03c59b6fbfb (patch)
tree12965784f364d986bcc226565c4e96d7405fb62c /modules/bullet/collision_object_bullet.cpp
parent9a78efc7c270211e49fd7b2f071b61c706febffc (diff)
Rewritten kinematic system
Diffstat (limited to 'modules/bullet/collision_object_bullet.cpp')
-rw-r--r--modules/bullet/collision_object_bullet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/collision_object_bullet.cpp b/modules/bullet/collision_object_bullet.cpp
index 5739568d91..449d4322d4 100644
--- a/modules/bullet/collision_object_bullet.cpp
+++ b/modules/bullet/collision_object_bullet.cpp
@@ -101,7 +101,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) {