diff options
| author | Juan Linietsky | 2018-05-07 16:12:27 -0300 |
|---|---|---|
| committer | GitHub | 2018-05-07 16:12:27 -0300 |
| commit | 6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab (patch) | |
| tree | 13c691ec60e4307a9ece3272ceaee10d098514f1 /modules | |
| parent | dff3a2f3789ee2fb7eebb1d115097b944b439a18 (diff) | |
| parent | 9e57a07fb60fcd6c55bd51cf63d4c3cf4c6a3b26 (diff) | |
| download | godot-6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab.tar.gz godot-6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab.tar.zst godot-6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab.zip | |
Merge pull request #11973 from AndreaCatania/ragdoll
Ragdoll - Physical bone node
Diffstat (limited to '')
| -rw-r--r-- | modules/bullet/godot_result_callbacks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index 1bf259da8..197550d68 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -110,7 +110,7 @@ bool GodotKinClosestConvexResultCallback::needsCollision(btBroadphaseProxy *prox if (gObj->getType() == CollisionObjectBullet::TYPE_AREA) return false; - if (m_self_object->has_collision_exception(gObj)) + if (m_self_object->has_collision_exception(gObj) || gObj->has_collision_exception(m_self_object)) return false; } return true; |