[Bf-blender-cvs] [99c3ac17f20] master: Modifiers: default to exact boolean method ignoring build options

Campbell Barton noreply at git.blender.org
Thu Sep 3 05:35:07 CEST 2020


Commit: 99c3ac17f2011f8c554a98ed8f9010a7befc884c
Author: Campbell Barton
Date:   Thu Sep 3 10:07:39 2020 +1000
Branches: master
https://developer.blender.org/rB99c3ac17f2011f8c554a98ed8f9010a7befc884c

Modifiers: default to exact boolean method ignoring build options

This change doesn't impact release builds,
in general avoid having defaults depend on build options
since it means files from different builds won't match.

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

M	source/blender/modifiers/intern/MOD_boolean.c

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

diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 1a6ceefe5e8..87489c90de3 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -76,11 +76,7 @@ static void initData(ModifierData *md)
 
   bmd->double_threshold = 1e-6f;
   bmd->operation = eBooleanModifierOp_Difference;
-#ifdef WITH_GMP
   bmd->solver = eBooleanModifierSolver_Exact;
-#else
-  bmd->solver = eBooleanModifierSolver_Fast;
-#endif
 }
 
 static bool isDisabled(const struct Scene *UNUSED(scene),
@@ -322,12 +318,12 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
         }
 
 #ifdef WITH_GMP
-        bool use_exact = bmd->solver == eBooleanModifierSolver_Exact;
+        const bool use_exact = bmd->solver == eBooleanModifierSolver_Exact;
 #else
         if (bmd->solver == eBooleanModifierSolver_Exact) {
           BKE_modifier_set_error(md, "Compiled without GMP, using fast solver");
         }
-        bool use_exact = false;
+        const bool use_exact = false;
 #endif
 
         if (use_exact) {



More information about the Bf-blender-cvs mailing list