Assign automatic/envelope weights in weight paint mode is back,
[blender-staging.git] / intern / SConscript
index a9f8196e23e1c882fea8a402e9f89dc6736c0928..241662b708888baa4d65a720eea6e139406bc47e 100644 (file)
@@ -1,20 +1,30 @@
 #!/usr/bin/python
-SConscript(['SoundSystem/SConscript',
+Import ('env')
+
+SConscript(['audaspace/SConscript',
             'string/SConscript',
             'ghost/SConscript',
             'guardedalloc/SConscript',
-            'bmfont/SConscript',
             'moto/SConscript',
             'container/SConscript',
             'memutil/SConscript/',
             'decimation/SConscript',
             'iksolver/SConscript',
-            'elbeem/SConscript',
-            'opennl/SConscript'])
+            'itasc/SConscript',
+            'boolop/SConscript',
+            'opennl/SConscript',
+            'smoke/SConscript'])
 
+# NEW_CSG was intended for intern/csg, but
+# getting it to compile is difficult
+# intern/bsp has been used anyway, so
+# perhaps get rid of intern/csg?
 NEW_CSG='false'
 
+if not env['BF_NO_ELBEEM']:
+    SConscript(['elbeem/SConscript'])
+
 if NEW_CSG=='false':
-       SConscript(['bsp/SConscript'])
+    SConscript(['bsp/SConscript'])
 else:
-       SConscript(['csg/SConscript'])
+    SConscript(['csg/SConscript'])