Merged changes in the trunk up to revision 28536.
[blender.git] / source / blender / editors / transform / transform.c
index 7c98ca44fba1550bea049748b5f78db6047916cd..bdf9203961900073ec54f33a907f5ed7a0105dae 100644 (file)
@@ -533,9 +533,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;
 
@@ -1666,6 +1663,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()