From e44dfbbba5456d2479afd95faec325e069942f0a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 3 Oct 2018 13:10:11 +1000 Subject: Transform: enable shrink-wrap even offset by default Holding Alt now disables. --- source/blender/editors/transform/transform.c | 9 +++++---- source/blender/editors/transform/transform_ops.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index bfd678d83ea..55fa1fb78c6 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -2211,13 +2211,14 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op) { const char *prop_id = NULL; + bool prop_state = true; if (t->mode == TFM_SHRINKFATTEN) { prop_id = "use_even_offset"; + prop_state = false; } if (prop_id && (prop = RNA_struct_find_property(op->ptr, prop_id))) { - - RNA_property_boolean_set(op->ptr, prop, (t->flag & T_ALT_TRANSFORM) != 0); + RNA_property_boolean_set(op->ptr, prop, ((t->flag & T_ALT_TRANSFORM) != 0) == prop_state); } } @@ -4985,7 +4986,7 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) } } BLI_snprintf(str + ofs, sizeof(str) - ofs, IFACE_(" or Alt) Even Thickness %s"), - WM_bool_as_string((t->flag & T_ALT_TRANSFORM) != 0)); + WM_bool_as_string((t->flag & T_ALT_TRANSFORM) == 0)); /* done with header string */ FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -5000,7 +5001,7 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) /* get the final offset */ tdistance = distance * td->factor; - if (td->ext && (t->flag & T_ALT_TRANSFORM)) { + if (td->ext && (t->flag & T_ALT_TRANSFORM) == 0) { tdistance *= td->ext->isize[0]; /* shell factor */ } diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 5fe8f05d2da..3e6e1f85002 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -879,7 +879,7 @@ static void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot) RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX); - RNA_def_boolean(ot->srna, "use_even_offset", false, "Offset Even", "Scale the offset to give more even thickness"); + RNA_def_boolean(ot->srna, "use_even_offset", true, "Offset Even", "Scale the offset to give more even thickness"); WM_operatortype_props_advanced_begin(ot); -- cgit v1.2.3