Merging revision 30126:30261 from trunk.

This commit is contained in:
Joerg Mueller
2010-07-13 11:14:49 +00:00
108 changed files with 12318 additions and 13767 deletions

View File

@@ -1994,10 +1994,7 @@ void setupGamePython(KX_KetsjiEngine* ketsjiengine, KX_Scene* startscene, Main *
initBGL();
initBLF();
AUD_initPython();
#ifdef WITH_FFMPEG
initVideoTexture();
#endif
/* could be done a lot more nicely, but for now a quick way to get bge.* working */
PyRun_SimpleString("__import__('sys').modules['bge']=[mod for mod in (type(__builtins__)('bge'), ) if mod.__dict__.update({'logic':__import__('GameLogic'), 'render':__import__('Rasterizer'), 'events':__import__('GameKeys'), 'constraints':__import__('PhysicsConstraints'), 'types':__import__('GameTypes')}) is None][0]");