diff options
author | Martin Poirier <theeth@yahoo.com> | 2009-12-30 00:20:46 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2009-12-30 00:20:46 +0300 |
commit | d98811d414d0a30ae38397a2041613d332bcd4a8 (patch) | |
tree | c66729b0f279cd8576cac527b130c40a303abdb6 /source/blender/editors/transform | |
parent | c947fbe43dece2b36c5daf411f51cc081c3aad67 (diff) |
mmb only cancels constraint if mouse isn't moved (was broken since early 2.5 code, selection code needed to be earlier in event handling).
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 896d9ec5c2f..7de2006a35c 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -533,6 +533,9 @@ int transformEvent(TransInfo *t, wmEvent *event) if (event->type == MOUSEMOVE) { + if (t->modifiers & MOD_CONSTRAINT_SELECT) + t->con.mode |= CON_SELECT; + t->mval[0] = event->x - t->ar->winrct.xmin; t->mval[1] = event->y - t->ar->winrct.ymin; @@ -742,11 +745,11 @@ int transformEvent(TransInfo *t, wmEvent *event) } } else { + t->modifiers |= MOD_CONSTRAINT_SELECT; if (t->con.mode & CON_APPLY) { stopConstraint(t); } else { - t->modifiers |= MOD_CONSTRAINT_SELECT; if (event->shift) { initSelectConstraint(t, t->spacemtx); } @@ -1606,9 +1609,6 @@ void transformApply(bContext *C, TransInfo *t) { if (t->redraw) { - if (t->modifiers & MOD_CONSTRAINT_SELECT) - t->con.mode |= CON_SELECT; - selectConstraint(t); if (t->transform) { t->transform(t, t->mval); // calls recalcData() |