merge with trunk at r31523
[blender.git] / source / blender / SConscript
index d2eec1772f8559c3adf262a5fedca30e161aa5cb..24514f1660c152626c3544432af890a92b959059 100644 (file)
@@ -3,6 +3,7 @@ Import ('env')
 import sys
 
 SConscript(['avi/SConscript',
+            'bmesh/SConscript',
             'blenkernel/SConscript',
             'blenlib/SConscript',
             'blenloader/SConscript',
@@ -10,15 +11,15 @@ SConscript(['avi/SConscript',
             'gpu/SConscript',
             'editors/SConscript',
             'imbuf/SConscript',
-            'imbuf/intern/cineon/SConscript',
             'makesdna/SConscript',
             'makesrna/SConscript',
-            'radiosity/SConscript',
             'readblenfile/SConscript',
             'render/SConscript',
             'nodes/SConscript',
+            'modifiers/SConscript',
+            'ikplugin/SConscript',
             'windowmanager/SConscript',
-           'blenfont/SConscript'])
+            'blenfont/SConscript'])
 
 
 
@@ -28,6 +29,9 @@ 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'])