diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-02 20:42:30 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-08-02 20:42:30 +0400 |
| commit | 1a5998bc4ecaf23db4dbcf41d3872019944c74ac (patch) | |
| tree | a9f3a2b0c6b9bc6c4622bb47867035b4b39bd8f3 /build_files | |
| parent | ba5c635502b4eb7a96d9aae970117778c27243e6 (diff) | |
Remove old boolean operation module
Carve proved it's a way to go, so the time have came to get rid of old
boolean operation module which isn't used anymore.
Still kept BOP interface but move it to BSP module. At some point it
could be cleaned up further (like perhaps removed extra abstraction
level or so) but would be nice to combine such a refactor with making
BSP aware of NGons.
Tested on linux using both cmake and scons, possible regressions on
windows/osx. Would check windoes build just after commit.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 1 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 777fbbf0dba..06a82261795 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -15,7 +15,6 @@ set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL) set(WITH_CYCLES OFF CACHE FORCE BOOL) set(WITH_FFTW3 OFF CACHE FORCE BOOL) set(WITH_LIBMV OFF CACHE FORCE BOOL) -set(WITH_CARVE OFF CACHE FORCE BOOL) set(WITH_GAMEENGINE OFF CACHE FORCE BOOL) set(WITH_COMPOSITOR OFF CACHE FORCE BOOL) set(WITH_GHOST_XDND OFF CACHE FORCE BOOL) diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index e08a013d081..034d261e7cd 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -164,7 +164,7 @@ def validate_arguments(args, bc): 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES', 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE', 'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH', 'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH', - 'WITH_BF_LIBMV', 'WITH_BF_CARVE' + 'WITH_BF_LIBMV' ] # Have options here that scons expects to be lists @@ -530,7 +530,6 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression', True)), (BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache compression', True)), - (BoolVariable('WITH_BF_CARVE', 'Enable carve library for mesh boolean operations', True)), (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)), |