Commit: 92786141159430fa36e59e0229e4bbb84f2f04be
Author: Sergey Sharybin
Date:   Thu Feb 8 16:27:28 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB92786141159430fa36e59e0229e4bbb84f2f04be

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc CMakeLists.txt
index 650f5ec4ff2,c0a0b4bd27f..0ce35da95f1
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -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.
diff --cc source/blender/modifiers/intern/MOD_boolean.c
index 0554fbb0317,2a6bf108f25..7f79c941770
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@@ -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)
  {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to