Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2010-07-13 15:14:49 +0400
committerJoerg Mueller <nexyon@gmail.com>2010-07-13 15:14:49 +0400
commit7a89b679c93091c1c07150d8dcbdfdf8321d78d1 (patch)
tree25dc563bfb5db4d461b263e09075b6d232605330 /source/gameengine/Ketsji/KX_PythonInit.cpp
parent9772eb4d5f7e6e8388b835f8293dececc990bbd3 (diff)
parent161ee379a06d57f0dc732960ae05f089924727fb (diff)
Merging revision 30126:30261 from trunk.
Diffstat (limited to 'source/gameengine/Ketsji/KX_PythonInit.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_PythonInit.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 73d45eb97aa..04edec7c106 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -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]");