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/BlenderRoutines | |
| parent | fe850bd1637b9d0efd28cfcc648903172d7b9303 (diff) | |
| parent | 0949d48d25efdb703e7b411b4403f3cdf0eb5308 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099
Diffstat (limited to 'source/gameengine/BlenderRoutines')
| -rw-r--r-- | source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 980aa1d47b1..5d4541dcf03 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -406,7 +406,6 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, int alw sceneconverter->ConvertScene( startscene, dictionaryobject, - keyboarddevice, rendertools, canvas); ketsjiengine->AddScene(startscene); @@ -718,7 +717,6 @@ extern "C" void StartKetsjiShellSimulation(struct wmWindow *win, sceneconverter->ConvertScene( startscene, dictionaryobject, - keyboarddevice, rendertools, canvas); ketsjiengine->AddScene(startscene); |