Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

get rid of annoying duplicate python initialization code, added setupGamePython() which initializes modules

Browse Source
This commit is contained in:
Campbell Barton
2010-01-10 22:03:26 +00:00
parent 34794eafe4
commit affe84a453
4 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
View File

@@ -679,21 +679,11 @@ bool GPG_Application::startEngine(void)
startscenename,
m_startScene);
// some python things
PyObject* dictionaryobject = initGamePlayerPythonScripting("Ketsji", psl_Lowest, m_maggie, m_argc, m_argv);
m_ketsjiengine->SetPyNamespace(dictionaryobject);
initRasterizer(m_rasterizer, m_canvas);
PyObject *gameLogic = initGameLogic(m_ketsjiengine, startscene);
PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module
initGameKeys();
initPythonConstraintBinding();
initMathutils();
initGeometry();
initBGL();
#ifdef WITH_FFMPEG
initVideoTexture();
#endif
#ifndef DISABLE_PYTHON
// some python things
PyObject *gameLogic, *gameLogic_keys;
setupGamePython(m_ketsjiengine, startscene, m_maggie, NULL, &gameLogic, &gameLogic_keys, m_argc, m_argv);
#endif // DISABLE_PYTHON
//initialize Dome Settings
if(m_startScene->gm.stereoflag == STEREO_DOME)