Merging r38740 through r38764 from trunk into vgroup_modifiers.
[blender.git] / source / blender / SConscript
index 3625678f6102603782d91d632e37fc2fc18d190f..969bd2966fcb0f1e44410f3729d539f7894bb5d8 100644 (file)
@@ -10,12 +10,11 @@ SConscript(['avi/SConscript',
             'gpu/SConscript',
             'editors/SConscript',
             'imbuf/SConscript',
-            'imbuf/intern/cineon/SConscript',
             'makesdna/SConscript',
             'makesrna/SConscript',
-            'readblenfile/SConscript',
             'render/SConscript',
             'nodes/SConscript',
+            'modifiers/SConscript',
             'ikplugin/SConscript',
             'windowmanager/SConscript',
             'blenfont/SConscript'])
@@ -28,8 +27,14 @@ if env['WITH_BF_PYTHON']:
 if env['WITH_BF_DDS']:
     SConscript (['imbuf/intern/dds/SConscript'])
 
+if env['WITH_BF_CINEON']:
+    SConscript (['imbuf/intern/cineon/SConscript'])
+
 if env['WITH_BF_OPENEXR']:
     SConscript (['imbuf/intern/openexr/SConscript'])
 
 if env['WITH_BF_QUICKTIME']:
     SConscript (['quicktime/SConscript'])
+
+if env['WITH_BF_COLLADA']:
+    SConscript (['collada/SConscript'])