svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17236:HEAD

2008-11-01 22:04:41 +00:00
parent 5b205ce852
commit 3c9520f92f
67 changed files with 6996 additions and 120 deletions
--- a/source/gameengine/SConscript
+++ b/source/gameengine/SConscript
@@ -15,7 +15,8 @@ SConscript(['BlenderRoutines/SConscript',
            'Rasterizer/RAS_OpenGLRasterizer/SConscript',
            'SceneGraph/SConscript',
            'Physics/Bullet/SConscript',
-            'Physics/Sumo/SConscript'
+            'Physics/Sumo/SConscript',
+            'VideoTexture/SConscript'
            ])

 if env['WITH_BF_PLAYER']: