diff options
| -rw-r--r-- | source/gameengine/GamePlayer/common/load.blend | bin | 135908 -> 60988 bytes | |||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 15 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/source/gameengine/GamePlayer/common/load.blend b/source/gameengine/GamePlayer/common/load.blend Binary files differindex 1490fba6108..ae520504971 100644 --- a/source/gameengine/GamePlayer/common/load.blend +++ b/source/gameengine/GamePlayer/common/load.blend diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 9143526f497..51f81eb2583 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -643,18 +643,23 @@ bool GPG_Application::startEngine(void) m_audiodevice, startscenename); + // some python things - PyObject* m_dictionaryobject = initGamePlayerPythonScripting("Ketsji", psl_Lowest); - m_ketsjiengine->SetPythonDictionary(m_dictionaryobject); + PyObject* dictionaryobject = initGamePythonScripting("Ketsji", psl_Lowest); + m_ketsjiengine->SetPythonDictionary(dictionaryobject); initRasterizer(m_rasterizer, m_canvas); - initGameLogic(startscene); + PyObject *gameLogic = initGameLogic(startscene); initGameKeys(); initPythonConstraintBinding(); - + + + + + m_sceneconverter->ConvertScene( startscenename, startscene, - m_dictionaryobject, + dictionaryobject, m_keyboard, m_rendertools, m_canvas); diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 65751a995d9..7a937d5e349 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -830,7 +830,7 @@ PyObject *KXpy_import(PyObject *self, PyObject *args) /* quick hack for GamePython modules TODO: register builtin modules properly by ExtendInittab */ - if (!strcmp(name, "GameLogic") || !strcmp(name, "GameKeys") || + if (!strcmp(name, "GameLogic") || !strcmp(name, "GameKeys") || !strcmp(name, "PhysicsConstraints") || !strcmp(name, "Rasterizer")) { return PyImport_ImportModuleEx(name, globals, locals, fromlist); } |