From d7d65fa2f2b51d03f7bdfcbceedca99188ce979c Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Wed, 19 Feb 2014 11:57:14 -0300
Subject: -improved physics ccd -html5 exporter works again -disable repeat on
 image loader by default -can change shape offset en tileset, texture offset
 was broken

---
 servers/physics/body_pair_sw.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'servers/physics/body_pair_sw.cpp')

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;
 	}
 
-- 
cgit v1.2.3-70-g09d2