Merging r49499 through r49518 from trunk into soc-2011-tomato

2012-08-03 09:08:40 +00:00
parent 3c2fffd1a9 db8c9c24f6
commit f736f183a5
79 changed files with 639 additions and 10155 deletions
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -11,7 +11,6 @@ SConscript(['audaspace/SConscript',
            'decimation/SConscript',
            'iksolver/SConscript',
            'itasc/SConscript',
-            'boolop/SConscript',
            'opennl/SConscript',
            'mikktspace/SConscript',
            'smoke/SConscript',
@@ -26,7 +25,8 @@ if env['WITH_BF_FLUID']:
 if env['WITH_BF_CYCLES']:
    SConscript(['cycles/SConscript'])

-SConscript(['bsp/SConscript'])
+if env['WITH_BF_BOOLEAN']:
+    SConscript(['bsp/SConscript'])

 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
    SConscript(['utfconv/SConscript'])