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/GamePlayer/ghost/GPG_Application.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/GamePlayer/ghost/GPG_Application.cpp')
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index a3805bd4317..4c824a8df40 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -708,10 +708,8 @@ bool GPG_Application::startEngine(void) loadGamePythonConfig(m_pyGlobalDictString, m_pyGlobalDictString_Length); m_sceneconverter->ConvertScene( - startscenename, startscene, dictionaryobject, - m_keyboard, m_rendertools, m_canvas); m_ketsjiengine->AddScene(startscene); |