diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-01 03:42:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-01 03:42:22 +0400 |
| commit | 0b3fd395ef3c6d9f3a83712abe2903cb661e94eb (patch) | |
| tree | 5b40726d5a0def595cfbf2b397817b257387c12c /source/gameengine/Ketsji/KX_NearSensor.cpp | |
| parent | fe850bd1637b9d0efd28cfcc648903172d7b9303 (diff) | |
| parent | 0949d48d25efdb703e7b411b4403f3cdf0eb5308 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099
Diffstat (limited to 'source/gameengine/Ketsji/KX_NearSensor.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp index 1a211a64b35..6871aeebc76 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.cpp +++ b/source/gameengine/Ketsji/KX_NearSensor.cpp @@ -47,14 +47,12 @@ KX_NearSensor::KX_NearSensor(SCA_EventManager* eventmgr, float resetmargin, bool bFindMaterial, const STR_String& touchedpropname, - class KX_Scene* scene, PHY_IPhysicsController* ctrl) :KX_TouchSensor(eventmgr, gameobj, bFindMaterial, false, - touchedpropname - /*, scene */), + touchedpropname), m_Margin(margin), m_ResetMargin(resetmargin) |