[Bf-blender-cvs] [01e6402] bmesh-boolean-experiment: Minor edits - enable dissolve by default

[Campbell Barton]

Commit: 01e640214a53b082da4612e7839cbba6fbbeed43
Author: Campbell Barton
Date:   Thu Dec 3 17:51:59 2015 +1100
Branches: bmesh-boolean-experiment
https://developer.blender.org/rB01e640214a53b082da4612e7839cbba6fbbeed43

Minor edits - enable dissolve by default

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/modifiers/intern/MOD_boolean.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 457e8c3..fbe3979 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -152,14 +152,16 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col = split.column()
         col.label(text="Operation:")
         col.prop(md, "operation", text="")
-        if md.method == 'BMESH':
-            col.prop(md, "threshold")
-            col.prop(md, "options", expand=True)
 
         col = split.column()
         col.label(text="Object:")
         col.prop(md, "object", text="")
 
+        if md.method == 'BMESH':
+            layout.label("BMesh Options:")
+            layout.prop(md, "threshold")
+            layout.row().prop(md, "options", expand=True)
+
     def BUILD(self, layout, ob, md):
         split = layout.split()
 
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 05cc231..cefd5b1 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -62,6 +62,13 @@
 #include "PIL_time.h"
 #include "PIL_time_utildefines.h"
 
+static void initData(ModifierData *md)
+{
+	BooleanModifierData *bmd = (BooleanModifierData *)md;
+
+	bmd->flag = eBooleanModifierFlag_Dissolve;
+}
+
 static void copyData(ModifierData *md, ModifierData *target)
 {
 #if 0
@@ -387,7 +394,7 @@ ModifierTypeInfo modifierType_Boolean = {
 	/* deformMatricesEM */  NULL,
 	/* applyModifier */     applyModifier,
 	/* applyModifierEM */   NULL,
-	/* initData */          NULL,
+	/* initData */          initData,
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,