Merged changes in the trunk up to revision 27752.
[blender.git] / source / blender / editors / transform / transform.c
index 36ccb5096534c8a533abee6ea2dababd2cbb16cc..5c3d133f5230e4ddaca2eb39636668fb2eacd7f7 100644 (file)
@@ -537,9 +537,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;
 
@@ -1671,6 +1668,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()