merge with trunk at r31523
[blender.git] / source / blender / SConscript
index 856d6284f440d1571321490c3f9f4a3a693b6424..24514f1660c152626c3544432af890a92b959059 100644 (file)
@@ -11,15 +11,15 @@ SConscript(['avi/SConscript',
             'gpu/SConscript',
             'editors/SConscript',
             'imbuf/SConscript',
             'gpu/SConscript',
             'editors/SConscript',
             'imbuf/SConscript',
-            'imbuf/intern/cineon/SConscript',
             'makesdna/SConscript',
             'makesrna/SConscript',
             'makesdna/SConscript',
             'makesrna/SConscript',
-            'radiosity/SConscript',
             'readblenfile/SConscript',
             'render/SConscript',
             'nodes/SConscript',
             'readblenfile/SConscript',
             'render/SConscript',
             'nodes/SConscript',
+            'modifiers/SConscript',
+            'ikplugin/SConscript',
             'windowmanager/SConscript',
             'windowmanager/SConscript',
-           'blenfont/SConscript'])
+            'blenfont/SConscript'])
 
 
 
 
 
 
@@ -29,8 +29,14 @@ if env['WITH_BF_PYTHON']:
 if env['WITH_BF_DDS']:
     SConscript (['imbuf/intern/dds/SConscript'])
 
 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_OPENEXR']:
     SConscript (['imbuf/intern/openexr/SConscript'])
 
 if env['WITH_BF_QUICKTIME']:
     SConscript (['quicktime/SConscript'])
+
+if env['WITH_BF_COLLADA']:
+    SConscript (['collada/SConscript'])