Merged changes in the trunk up to revision 31190.
[blender.git] / source / blender / editors / transform / transform.c
index a450222dd9553c9c6849122ecd44f7fa51b0ff00..460e19ad0bf0e7e64371a5e96fafc2428f6e82dc 100644 (file)
@@ -553,9 +553,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;
 
@@ -1696,6 +1693,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()