diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 14:57:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 14:57:07 +0400 |
| commit | 1e14ab99926a53fc540f3fb1e2a1e57f0ce559cc (patch) | |
| tree | d94d43f7f663638d1294a1069235059490ba93a9 /source/gameengine/Ketsji/KX_TouchSensor.cpp | |
| parent | 2aa2512a43781f6ac8937c152398e9de731aef07 (diff) | |
| parent | a4f3f5c23c4201bc885310aa17226d2ee3922a2a (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22668:22701
Diffstat (limited to 'source/gameengine/Ketsji/KX_TouchSensor.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_TouchSensor.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp index bf8469f1ec9..26e414c5b47 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.cpp +++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp @@ -101,8 +101,7 @@ KX_TouchSensor::KX_TouchSensor(SCA_EventManager* eventmgr,KX_GameObject* gameobj :SCA_ISensor(gameobj,eventmgr), m_touchedpropname(touchedpropname), m_bFindMaterial(bFindMaterial), -m_bTouchPulse(bTouchPulse), -m_eventmgr(eventmgr) +m_bTouchPulse(bTouchPulse) /*m_sumoObj(sumoObj),*/ { // KX_TouchEventManager* touchmgr = (KX_TouchEventManager*) eventmgr; |