godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Rewritten kinematic system

Browse Source
This commit is contained in:
AndreaCatania
2017-11-07 15:22:09 +01:00
parent 9a78efc7c2
commit 10f879bf88
16 changed files with 271 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bullet/collision_object_bullet.cpp
View File

@@ -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) {