archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Modifiers: default to exact boolean method ignoring build options

Browse Source 
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.
This commit is contained in:
Campbell Barton
2020-09-03 10:07:39 +10:00
parent 14e2596d21
commit 99c3ac17f2
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/modifiers/intern/MOD_boolean.c
View File

@@ -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) {