diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-17 12:59:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-17 13:00:11 +0400 |
| commit | fcaf144a2a0b96f1ad5e65f42dc55717a42c65b5 (patch) | |
| tree | f47c62f498711f935949f59c57841c69475e025e | |
| parent | 80f3956972aad9822ff9d751578ee3d984eb3bec (diff) | |
Mask: enable overlap detection by default, more compact buttons
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_mask_common.py | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mask.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index 43d769921a4..c38173c29b1 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -108,8 +108,8 @@ class MASK_PT_layers: layout.prop(active_layer, "falloff") row = layout.row(align=True) - layout.prop(active_layer, "use_fill_overlap") - layout.prop(active_layer, "use_fill_holes") + row.prop(active_layer, "use_fill_overlap", text="Overlap") + row.prop(active_layer, "use_fill_holes", text="Holes") class MASK_PT_spline(): diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index fab7ebf2060..9b7886ece97 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -150,7 +150,7 @@ MaskLayer *BKE_mask_layer_new(Mask *mask, const char *name) masklay->blend = MASK_BLEND_MERGE_ADD; masklay->alpha = 1.0f; - masklay->flag = MASK_LAYERFLAG_FILL_DISCRETE; + masklay->flag = MASK_LAYERFLAG_FILL_DISCRETE | MASK_LAYERFLAG_FILL_OVERLAP; return masklay; } diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 0c8347f980e..fcd84ea2720 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -1034,8 +1034,7 @@ static BMOpDefine bmo_dissolve_degenerate_def = { {{'\0'}}, }, /* slots_out */ - {{"verts.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* output vertices */ - {{'\0'}}}, + {{{'\0'}}}, bmo_dissolve_degenerate_exec, BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH, }; |