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_BlenderSceneConverter.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_BlenderSceneConverter.cpp')
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 776a3528d89..4df9df75d3d 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -244,7 +244,6 @@ struct BlenderDebugDraw : public btIDebugDraw void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene, PyObject* dictobj, - class SCA_IInputDevice* keyinputdev, class RAS_IRenderTools* rendertools, class RAS_ICanvas* canvas) { @@ -334,7 +333,6 @@ void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene, m_ketsjiEngine, physics_engine, dictobj, - keyinputdev, rendertools, canvas, this, |