Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Bolsee <benoit.bolsee@online.be>2009-05-24 16:53:49 +0400
committerBenoit Bolsee <benoit.bolsee@online.be>2009-05-24 16:53:49 +0400
commite41eeaa0451c8affeda8b9ff44a60d804d8622cc (patch)
tree0b072e8f23b5f1be44205155b0a35223639a359d /source/gameengine/Ketsji/KX_TouchEventManager.cpp
parent83bb096f24cb2252f90a77923bd1818930a2fed2 (diff)
BGE: renamed sensor type enum to avoid conflict with mingw (NEAR was causing the problem).
Diffstat (limited to 'source/gameengine/Ketsji/KX_TouchEventManager.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_TouchEventManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
index 46927541099..9603410c3ac 100644
--- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp
+++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
@@ -105,7 +105,7 @@ bool KX_TouchEventManager::newBroadphaseResponse(void *client_data,
it != info->m_sensors.end();
++it)
{
- if ((*it)->GetSensorType() == SCA_ISensor::TOUCH)
+ if ((*it)->GetSensorType() == SCA_ISensor::ST_TOUCH)
{
KX_TouchSensor* touchsensor = static_cast<KX_TouchSensor*>(*it);
if (touchsensor->BroadPhaseSensorFilterCollision(object1, object2))