Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 8 Feb 2018 15:27:28 +0000 (16:27 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 8 Feb 2018 15:27:28 +0000 (16:27 +0100)
1  2 
CMakeLists.txt
build_files/cmake/macros.cmake
extern/CMakeLists.txt
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_boolean.c
source/blender/python/intern/CMakeLists.txt
source/blenderplayer/CMakeLists.txt

diff --cc CMakeLists.txt
index 650f5ec4ff2d6b0a3cd3078f9a50ff726b58d949,c0a0b4bd27f0132ea177614b85bf378c53cf37cd..0ce35da95f1306742932b75cd0d7afd0d8aa7238
@@@ -639,9 -643,13 +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)
 -
 -      set_and_warn(WITH_OPENAL         OFF)  # depends on AUDASPACE
 -      set_and_warn(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
 -      set_and_warn(WITH_PLAYER         OFF)  # depends on GAMEENGINE
 -elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL OR
 +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.
Simple merge
Simple merge
index 0554fbb0317de70a85c4b06568fd1b469e37bb07,2a6bf108f25540c6a5cf6d6223ea8af783c59354..7f79c9417705e5f32b46ecea02fe6ca51e2bbc6e
@@@ -49,7 -45,8 +45,6 @@@
  #include "BKE_library_query.h"
  #include "BKE_modifier.h"
  
- #include "MOD_boolean_util.h"
 -#include "depsgraph_private.h"
 -
  #include "MOD_util.h"
  
  
@@@ -185,8 -187,8 +169,8 @@@ static int bm_face_isect_pair(BMFace *f
        return BM_elem_flag_test(f, BM_FACE_TAG) ? 1 : 0;
  }
  
- static DerivedMesh *applyModifier_bmesh(
-         ModifierData *md, Object *ob,
+ static DerivedMesh *applyModifier(
 -        ModifierData *md, Object *ob,
++        ModifierData *md, const struct EvaluationContext *UNUSED(eval_ctx), Object *ob,
          DerivedMesh *dm,
          ModifierApplyFlag flag)
  {
Simple merge