[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46380] trunk/blender/intern/SConscript: Cleanup of intern/SConstript: CSG is not in source tree anymore, remove option to use it

[Sergey Sharybin]

Revision: 46380
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46380
Author:   nazgul
Date:     2012-05-07 09:01:55 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Cleanup of intern/SConstript: CSG is not in source tree anymore, remove option to use it

Modified Paths:
--------------
    trunk/blender/intern/SConscript

Modified: trunk/blender/intern/SConscript
===================================================================
--- trunk/blender/intern/SConscript	2012-05-07 08:55:29 UTC (rev 46379)
+++ trunk/blender/intern/SConscript	2012-05-07 09:01:55 UTC (rev 46380)
@@ -16,25 +16,16 @@
             'mikktspace/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 env ['WITH_BF_REMESH']:
     SConscript(['dualcon/SConscript'])
 
 if env['WITH_BF_FLUID']:
     SConscript(['elbeem/SConscript'])
-    
+
 if env['WITH_BF_CYCLES']:
     SConscript(['cycles/SConscript'])
 
-if NEW_CSG == 'false':
-    SConscript(['bsp/SConscript'])
-else:
-    SConscript(['csg/SConscript'])
+SConscript(['bsp/SConscript'])
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
     SConscript(['utfconv/SConscript'])