diff options
| author | Juan Linietsky | 2014-02-19 11:57:14 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-02-19 11:57:14 -0300 |
| commit | d7d65fa2f2b51d03f7bdfcbceedca99188ce979c (patch) | |
| tree | fecdf1bfa39ba5a4895b4dbf340a3b68098c109a /servers/physics/body_pair_sw.cpp | |
| parent | 8c1731b67995add31361ae526b0e6af76346181e (diff) | |
| download | godot-d7d65fa2f2b51d03f7bdfcbceedca99188ce979c.tar.gz godot-d7d65fa2f2b51d03f7bdfcbceedca99188ce979c.tar.zst godot-d7d65fa2f2b51d03f7bdfcbceedca99188ce979c.zip | |
Diffstat (limited to 'servers/physics/body_pair_sw.cpp')
| -rw-r--r-- | servers/physics/body_pair_sw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics/body_pair_sw.cpp b/servers/physics/body_pair_sw.cpp index 06ae34098..094f56a42 100644 --- a/servers/physics/body_pair_sw.cpp +++ b/servers/physics/body_pair_sw.cpp @@ -198,7 +198,7 @@ bool BodyPairSW::setup(float p_step) { //cannot collide - if (A->has_exception(B->get_self()) || B->has_exception(A->get_self()) || (A->get_mode()<=PhysicsServer::BODY_MODE_STATIC_ACTIVE && B->get_mode()<=PhysicsServer::BODY_MODE_STATIC_ACTIVE)) { + if (A->has_exception(B->get_self()) || B->has_exception(A->get_self()) || (A->get_mode()<=PhysicsServer::BODY_MODE_KINEMATIC && B->get_mode()<=PhysicsServer::BODY_MODE_KINEMATIC)) { return false; } |