Merged changes in the trunk up to revision 41225.
[blender-staging.git] / source / blender / editors / transform / transform.c
index e3eb14e2fe6f851af5e6fdafc62d03ddc81aa14d..e7f9deeac6660a0c147763d6eecccb36862fb86b 100644 (file)
@@ -566,9 +566,6 @@ int transformEvent(TransInfo *t, wmEvent *event)
 
        if (event->type == MOUSEMOVE)
        {
-               if (t->modifiers & MOD_CONSTRAINT_SELECT)
-                       t->con.mode |= CON_SELECT;
-
                VECCOPY2D(t->mval, event->mval);
 
                // t->redraw |= TREDRAW_SOFT; /* Use this for soft redraw. Might cause flicker in object mode */
@@ -1741,6 +1738,9 @@ void transformApply(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()