svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099
[blender-staging.git] / source / gameengine / Converter / KX_ConvertSensors.cpp
index 0b395cfd4020682d4b17780fce8021352cdaef84..eb77e087de57cc2af7b20cfaee66e7e6960b880e 100644 (file)
@@ -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);
                                                
                                }