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/Converter/KX_ConvertSensors.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/Converter/KX_ConvertSensors.cpp')
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertSensors.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp index 0b395cfd402..eb77e087de5 100644 --- a/source/gameengine/Converter/KX_ConvertSensors.cpp +++ b/source/gameengine/Converter/KX_ConvertSensors.cpp @@ -28,6 +28,7 @@ * Conversion of Blender data blocks to KX sensor system */ + #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -94,7 +95,6 @@ void BL_ConvertSensors(struct Object* blenderobject, SCA_LogicManager* logicmgr, KX_Scene* kxscene, KX_KetsjiEngine* kxengine, - SCA_IInputDevice* keydev, int activeLayerBitInfo, bool isInActiveLayer, RAS_ICanvas* canvas, @@ -444,9 +444,8 @@ void BL_ConvertSensors(struct Object* blenderobject, blendernearsensor->dist, blendernearsensor->resetdist, bFindMaterial, - nearpropertyname,kxscene, - physCtrl - ); + nearpropertyname, + physCtrl); } break; @@ -648,8 +647,7 @@ void BL_ConvertSensors(struct Object* blenderobject, smallmargin, largemargin, bFindMaterial, - radarpropertyname, - kxscene); + radarpropertyname); } |