kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Disable bmesh-boolean modifier for 2.77 release

Browse Source 
Edit-mode boolean is still available
This commit is contained in:
Campbell Barton 2016-02-11 19:53:36 +11:00
parent bd60920576
commit 932cfb98e7
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@ -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()

2
source/blender/makesrna/intern/rna_modifier.c
View File

@ -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)

2
source/blender/modifiers/intern/MOD_boolean.c
View File

@ -33,7 +33,7 @@
*/
// #ifdef DEBUG_TIME
#define USE_BMESH
// #define USE_BMESH
#ifdef WITH_MOD_BOOLEAN
# define USE_CARVE WITH_MOD_BOOLEAN
#endif