From e07e8e31bb549ab654e18e6801b41b8919bffb00 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 15 Jan 2014 18:27:39 +1100 Subject: Fix T38166: Vertex slide C key doesn't work --- source/blender/editors/transform/transform.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'source') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 2fa28b34d13..a73063ff05e 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1358,23 +1358,29 @@ int transformEvent(TransInfo *t, const wmEvent *event) break; case CKEY: if (event->alt) { - t->flag ^= T_PROP_CONNECTED; - sort_trans_data_dist(t); - calculatePropRatio(t); - t->redraw = TREDRAW_HARD; - handled = true; + if (!(t->options & CTX_NO_PET)) { + t->flag ^= T_PROP_CONNECTED; + sort_trans_data_dist(t); + calculatePropRatio(t); + t->redraw = TREDRAW_HARD; + handled = true; + } } else { - stopConstraint(t); - t->redraw |= TREDRAW_HARD; - handled = true; + if (!(t->flag & T_NO_CONSTRAINT)) { + stopConstraint(t); + t->redraw |= TREDRAW_HARD; + handled = true; + } } break; case XKEY: case YKEY: case ZKEY: - transform_event_xyz_constraint(t, event->type, cmode); - handled = true; + if (!(t->flag & T_NO_CONSTRAINT)) { + transform_event_xyz_constraint(t, event->type, cmode); + handled = true; + } break; case OKEY: if (t->flag & T_PROP_EDIT && event->shift) { -- cgit v1.2.3