diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-14 19:46:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-14 19:46:04 +0300 |
| commit | 902d4c92ac3d0146984c459ba95f75f72324f675 (patch) | |
| tree | ac7ed5bb4ec45abea96da57e940d7161a7a99921 | |
| parent | 83435182720fa815194f7aed90cdf4ad81f50a81 (diff) | |
Use BMesh solver for new boolean modifiers
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index a9102000fac..a23ef6eaa82 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -1896,8 +1896,8 @@ static void rna_def_modifier_boolean(BlenderRNA *brna) }; static EnumPropertyItem prop_solver_items[] = { - {eBooleanModifierSolver_Carve, "CARVE", 0, "Carve", "Use the Carve boolean solver"}, {eBooleanModifierSolver_BMesh, "BMESH", 0, "BMesh", "Use the BMesh boolean solver"}, + {eBooleanModifierSolver_Carve, "CARVE", 0, "Carve", "Use the Carve boolean solver"}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 693db961950..da0f5aa3923 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -75,6 +75,7 @@ static void initData(ModifierData *md) { BooleanModifierData *bmd = (BooleanModifierData *)md; + bmd->solver = eBooleanModifierSolver_BMesh; bmd->double_threshold = 1e-6f; } |