[Bf-blender-cvs] [902d4c9] master: Use BMesh solver for new boolean modifiers

[Campbell Barton]

Commit: 902d4c92ac3d0146984c459ba95f75f72324f675
Author: Campbell Barton
Date:   Fri Jul 15 02:46:04 2016 +1000
Branches: master
https://developer.blender.org/rB902d4c92ac3d0146984c459ba95f75f72324f675

Use BMesh solver for new boolean modifiers

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

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

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

diff --git a/source/blender/makesrna/intern/rna_modifier.c 
b/source/blender/makesrna/intern/rna_modifier.c
index a910200..a23ef6e 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 693db96..da0f5aa 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;
 }

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