diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
| commit | c371f49d9aaf2c9eca90329954fe217efb5cf3f6 (patch) | |
| tree | 142b9cb20d8b963f0cfd8a8fd4ee6437a47dafc4 /source/gameengine/Ketsji/KX_KetsjiEngine.cpp | |
| parent | b55e996874c8b9a12b4a2a50f9d1993b5f921c57 (diff) | |
| parent | 7301f33b26ccae263d0bfdde5f82d98a70790fd5 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21908:22075
Diffstat (limited to 'source/gameengine/Ketsji/KX_KetsjiEngine.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index cc0f50d9e7a..3ae899cbe5f 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -1599,8 +1599,7 @@ KX_Scene* KX_KetsjiEngine::CreateScene(const STR_String& scenename) scenename, scene); - m_sceneconverter->ConvertScene(scenename, - tmpscene, + m_sceneconverter->ConvertScene(tmpscene, m_pythondictionary, m_keyboarddevice, m_rendertools, |