[Bf-blender-cvs] [932cfb9] master: Disable bmesh-boolean modifier for 2.77 release

[Campbell Barton]

Commit: 932cfb98e7838ac5f78e548ab89be200c48f6006
Author: Campbell Barton
Date:   Thu Feb 11 19:53:36 2016 +1100
Branches: master
https://developer.blender.org/rB932cfb98e7838ac5f78e548ab89be200c48f6006

Disable bmesh-boolean modifier for 2.77 release

Edit-mode boolean is still available

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/makesrna/intern/rna_modifier.c
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 f26147e..565d655 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -156,6 +156,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.label(text="Object:")
         col.prop(md, "object", text="")
 
+        """
         layout.prop(md, "use_bmesh")
         if md.use_bmesh:
             box = layout.box()
@@ -164,6 +165,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
             box.prop(md, "use_bmesh_dissolve")
             box.prop(md, "use_bmesh_connect_regions")
             box.prop(md, "threshold")
+        """
 
     def BUILD(self, layout, ob, md):
         split = layout.split()
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 5327850..961bbfe 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -1903,6 +1903,7 @@ static void rna_def_modifier_boolean(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Operation", "");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
+#if 0  /* WITH_MOD_BOOLEAN */
 	/* BMesh intersection options */
 	prop = RNA_def_property(srna, "use_bmesh", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "bm_flag", eBooleanModifierBMeshFlag_Enabled);
@@ -1930,6 +1931,7 @@ static void rna_def_modifier_boolean(BlenderRNA *brna)
 	RNA_def_property_ui_range(prop, 0, 1, 1, 7);
 	RNA_def_property_ui_text(prop, "Threshold",  "");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
+#endif
 }
 
 static void rna_def_modifier_array(BlenderRNA *brna)
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 03ff902..fbd8b79 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -33,7 +33,7 @@
  */
 
 // #ifdef DEBUG_TIME
-#define USE_BMESH
+// #define USE_BMESH
 #ifdef WITH_MOD_BOOLEAN
 #  define USE_CARVE WITH_MOD_BOOLEAN
 #endif