diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 18:07:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 18:07:38 +0400 |
| commit | fa01eef27e1a03aeba438e10ae11230f07ff0fb6 (patch) | |
| tree | 5c2cd5e69eeabe3d94510e0f33193d91d65c2351 /source/gameengine/BlenderRoutines | |
| parent | b592b6e8be051d590a6fa1806d44809c75df6515 (diff) | |
| parent | b40eb540d3a49c710bbd10effa9d9db04a915347 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20849:20855
to get the BGE building with py3k and no sdl
Diffstat (limited to 'source/gameengine/BlenderRoutines')
| -rw-r--r-- | source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index a70790ef2a0..a1df5621922 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -115,7 +115,6 @@ extern "C" void StartKetsjiShell(struct ScrArea *area, struct ARegion *ar, char* scenename, struct Main* maggie1, - struct SpaceIpo *sipo, int always_use_expand_framing) { int exitrequested = KX_EXIT_REQUEST_NO_REQUEST; @@ -342,7 +341,7 @@ extern "C" void StartKetsjiShell(struct ScrArea *area, } // create a scene converter, create and convert the startingscene - KX_ISceneConverter* sceneconverter = new KX_BlenderSceneConverter(blenderdata,sipo, ketsjiengine); + KX_ISceneConverter* sceneconverter = new KX_BlenderSceneConverter(blenderdata, ketsjiengine); ketsjiengine->SetSceneConverter(sceneconverter); sceneconverter->addInitFromFrame=false; if (always_use_expand_framing) @@ -562,7 +561,6 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area, struct ARegion *ar, char* scenename, struct Main* maggie, - struct SpaceIpo *sipo, int always_use_expand_framing) { int exitrequested = KX_EXIT_REQUEST_NO_REQUEST; @@ -661,7 +659,7 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area, if (exitrequested != KX_EXIT_REQUEST_QUIT_GAME) { // create a scene converter, create and convert the startingscene - KX_ISceneConverter* sceneconverter = new KX_BlenderSceneConverter(maggie,sipo, ketsjiengine); + KX_ISceneConverter* sceneconverter = new KX_BlenderSceneConverter(maggie, ketsjiengine); ketsjiengine->SetSceneConverter(sceneconverter); sceneconverter->addInitFromFrame=true; |