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 | |
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')
4 files changed, 1 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp index 7123277d4ef..779c75b484f 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp @@ -53,7 +53,6 @@ KX_NetworkMessageSensor::KX_NetworkMessageSensor( const STR_String &subject ) : SCA_ISensor(gameobj,eventmgr), - m_Networkeventmgr(eventmgr), m_NetworkScene(NetworkScene), m_subject(subject), m_frame_message_count (0), diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h index ade87697303..c955e560e0a 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h @@ -39,7 +39,6 @@ class KX_NetworkMessageSensor : public SCA_ISensor { // note: Py_Header MUST BE the first listed here Py_Header; - KX_NetworkEventManager *m_Networkeventmgr; NG_NetworkScene *m_NetworkScene; // The subject we filter on. 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; 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; |