diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-02-25 15:07:51 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-02-25 15:07:51 +0300 |
commit | 7fffb0b6302618049a35e6bacf0aeed70a47d8aa (patch) | |
tree | 8b61ee940e4777f9bed4b63e5e3cc55bf2803ce1 /source/gameengine/Ketsji/KX_TouchSensor.cpp | |
parent | c77af311665d230ed933138cd20962d021ad5c2b (diff) |
Building the game engine with Solid/Sumo is now optional for scons using WITH_BF_SOLID.
Now Sumo is has been deprecated for a while we might want to remove it for 2.5.
Diffstat (limited to 'source/gameengine/Ketsji/KX_TouchSensor.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_TouchSensor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp index 117adb44742..0b4d66dbb34 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.cpp +++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp @@ -34,7 +34,9 @@ #include "SCA_LogicManager.h" #include "KX_GameObject.h" #include "KX_TouchEventManager.h" -#include "KX_SumoPhysicsController.h" + +#include "PHY_IPhysicsController.h" + #include <iostream> #include "PHY_IPhysicsEnvironment.h" @@ -214,7 +216,7 @@ bool KX_TouchSensor::NewHandleCollision(void*object1,void*object2,const PHY_Coll } } - return DT_CONTINUE; + return false; // was DT_CONTINUE but this was defined in sumo as false. } |