Merged changes in the trunk up to revision 32271.

[blender.git] / source / blender / editors / transform / transform.c

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index a6fcfb0498206074eaa045cb65ff94b9eb676c67..215cbab8f1b5aef0527af74157a1228273b00f71 100644 (file)
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -556,9 +556,6 @@ 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;
 
@@ -1699,6 +1696,9 @@ void transformApply(const bContext *C, TransInfo *t)
 {
        if ((t->redraw & TREDRAW_HARD) || (t->draw_handle_apply == NULL && (t->redraw & TREDRAW_SOFT)))
        {
+               if (t->modifiers & MOD_CONSTRAINT_SELECT)
+                       t->con.mode |= CON_SELECT;
+
                selectConstraint(t);
                if (t->transform) {
                        t->transform(t, t->mval);  // calls recalcData()