diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-08 18:27:28 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-08 18:27:28 +0300 |
commit | 92786141159430fa36e59e0229e4bbb84f2f04be (patch) | |
tree | dd93e8f2a611ecbbc05646533798e97354d0f34e /CMakeLists.txt | |
parent | bdc708762cf0fe0490bee3cf8452446da46d342a (diff) | |
parent | e0597baed57fa7a9dfaf6dff6d0fa120784d21ea (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 650f5ec4ff2..0ce35da95f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,7 +312,6 @@ endif() # Modifiers option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON) option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON) -option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON) option(WITH_MOD_REMESH "Enable Remesh Modifier" ON) # option(WITH_MOD_CLOTH_ELTOPO "Enable Experimental cloth solver" OFF) # this is now only available in a branch # mark_as_advanced(WITH_MOD_CLOTH_ELTOPO) @@ -639,9 +638,8 @@ if(NOT WITH_BOOST) set_and_warn(WITH_INTERNATIONAL OFF) set_and_warn(WITH_OPENVDB OFF) set_and_warn(WITH_OPENCOLORIO OFF) - set_and_warn(WITH_MOD_BOOLEAN OFF) elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR - WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_MOD_BOOLEAN) + WITH_OPENVDB OR WITH_OPENCOLORIO) # Keep enabled else() # New dependency graph needs either Boost or C++11 for function bindings. @@ -1710,7 +1708,6 @@ if(FIRST_RUN) endif() info_cfg_text("Modifiers:") - info_cfg_option(WITH_MOD_BOOLEAN) info_cfg_option(WITH_MOD_REMESH) info_cfg_option(WITH_MOD_FLUID) info_cfg_option(WITH_MOD_OCEANSIM) |