diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-02-11 11:53:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-02-11 11:56:24 +0300 |
| commit | 932cfb98e7838ac5f78e548ab89be200c48f6006 (patch) | |
| tree | 157421f0896e82bb0310e5ed6d3af44d9603a707 | |
| parent | bd60920576e7f788cd887f1f698aac183a6d1253 (diff) | |
Disable bmesh-boolean modifier for 2.77 release
Edit-mode boolean is still available
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index f26147e0673..565d6553bbd 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 5327850a572..961bbfe80e7 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 03ff902162d..fbd8b79c079 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 |