merge with trunk/2.5 at r24378

2009-11-07 23:10:18 +00:00
parent cfa4f3222a 4e9699debf
commit 2ead17843c
364 changed files with 53209 additions and 25151 deletions
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -34,3 +34,6 @@ if env['WITH_BF_OPENEXR']:

 if env['WITH_BF_QUICKTIME']:
    SConscript (['quicktime/SConscript'])
+
+if env['WITH_BF_COLLADA']:
+    SConscript (['collada/SConscript'])