diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 05:58:22 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 05:58:22 +0400 |
| commit | 63a88075b574e8f2f9adc041f423f49a7356d736 (patch) | |
| tree | 951f1f65d74d052debdafa14f6ad22750b6aad04 /source/gameengine/Ketsji/KX_TouchSensor.cpp | |
| parent | 11bdf6ea10ee7bc5e2862cdddbf42eddb06c42fa (diff) | |
| parent | 69a24325742c617a9902376b061006dfb24f0a3c (diff) | |
svn merge -r 23528:23646 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2009-jaguarandi
Diffstat (limited to 'source/gameengine/Ketsji/KX_TouchSensor.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_TouchSensor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp index cde67787e2f..2ce5b8d1496 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.cpp +++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp @@ -287,6 +287,7 @@ bool KX_TouchSensor::NewHandleCollision(void*object1,void*object2,const PHY_Coll return false; // was DT_CONTINUE but this was defined in sumo as false. } +#ifndef DISABLE_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -345,5 +346,6 @@ PyObject* KX_TouchSensor::pyattr_get_object_hit_list(void *self_v, const KX_PYAT return self->m_colliders->GetProxy(); } +#endif /* eof */ |