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.h | |
| 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.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_TouchSensor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index 6cbf5b15e3b..5f571614b06 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -58,7 +58,6 @@ protected: STR_String m_touchedpropname; bool m_bFindMaterial; bool m_bTouchPulse; /* changes in the colliding objects trigger pulses */ - class SCA_EventManager* m_eventmgr; class PHY_IPhysicsController* m_physCtrl; |