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_NearSensor.h
parent83bb096f24cb2252f90a77923bd1818930a2fed2 (diff)
BGE: renamed sensor type enum to avoid conflict with mingw (NEAR was causing the problem).
Diffstat (limited to 'source/gameengine/Ketsji/KX_NearSensor.h')
-rw-r--r--source/gameengine/Ketsji/KX_NearSensor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h
index d98b464a443..63099e181a0 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.h
+++ b/source/gameengine/Ketsji/KX_NearSensor.h
@@ -78,7 +78,7 @@ public:
const PHY_CollData * coll_data);
virtual bool BroadPhaseFilterCollision(void*obj1,void*obj2);
virtual bool BroadPhaseSensorFilterCollision(void*obj1,void*obj2) { return false; };
- virtual sensortype GetSensorType() { return NEAR; }
+ virtual sensortype GetSensorType() { return ST_NEAR; }
/* --------------------------------------------------------------------- */
/* Python interface ---------------------------------------------------- */