From fbe17e09a372a02c2729bd875f9d6d35e8a2f383 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 4 May 2011 20:42:34 +0000 Subject: alternative to joe's commit r36451. loopcut now follows 'Release confirms' user preference. --- source/blender/editors/transform/transform.c | 4 +--- source/blender/editors/transform/transform_ops.c | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 701b8affac2..614b048e0b8 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1521,9 +1521,7 @@ int initTransform(bContext *C, TransInfo *t, wmOperator *op, wmEvent *event, int t->mode = mode; t->launch_event = event ? event->type : -1; - if (RNA_property_is_set(op->ptr, "launch_event")) - t->launch_event = RNA_int_get(op->ptr, "launch_event"); - + if (t->launch_event == EVT_TWEAK_R) { t->launch_event = RIGHTMOUSE; diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 565ff769ccb..4edaabb9508 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -495,11 +495,10 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) { RNA_def_boolean(ot->srna, "texture_space", 0, "Edit Object data texture space", ""); } - + // Add confirm method all the time. At the end because it's not really that important and should be hidden only in log, not in keymap edit /*prop =*/ RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", "Always confirm operation when releasing button"); //RNA_def_property_flag(prop, PROP_HIDDEN); - RNA_def_int(ot->srna, "launch_event", 0, 0, INT_MAX, "Launch Event", "", 0, INT_MAX); } void TRANSFORM_OT_translate(struct wmOperatorType *ot) @@ -743,7 +742,7 @@ void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot) ot->poll = ED_operator_editmesh; RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f); - + Transform_Properties(ot, P_MIRROR|P_SNAP); } -- cgit v1.2.3