Revision: 30226
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30226
Author: ben2610
Date: 2010-07-12 15:25:57 +0200 (Mon, 12 Jul 2010)
Log Message:
-----------
BGE bug #22760: VideoTexture not available when Blender is compiled without
FFMPEG. VideoTexture can be used without FFMPEG, no need to disable it.
Modified Paths:
--------------
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2010-07-12
12:07:32 UTC (rev 30225)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2010-07-12
13:25:57 UTC (rev 30226)
@@ -1989,10 +1989,7 @@
initGeometry();
initBGL();
initBLF();
-
-#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]");
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
