svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099

2009-07-31 23:42:22 +00:00
parent fe850bd163 0949d48d25
commit 0b3fd395ef
23 changed files with 41 additions and 85 deletions
--- 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);