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_RadarSensor.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_RadarSensor.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_RadarSensor.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp index e39d3756b71..8ac94a324f2 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.cpp +++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp @@ -48,8 +48,7 @@ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr, double margin, double resetmargin, bool bFindMaterial, - const STR_String& touchedpropname, - class KX_Scene* kxscene) + const STR_String& touchedpropname) : KX_NearSensor( eventmgr, @@ -59,7 +58,6 @@ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr, resetmargin, bFindMaterial, touchedpropname, - kxscene, physCtrl), m_coneradius(coneradius), |