Merged changes in the trunk up to revision 26260.
[blender-staging.git] / source / blender / editors / transform / transform.c
index 7b5410069ff97aa22027238fcf278d7803266139..99ed4e04f0fd0ae262f8cfc97b0b5c562e22a2db 100644 (file)
@@ -540,9 +540,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;
 
@@ -1631,6 +1628,9 @@ 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()