Merged changes in the trunk up to revision 39368.
[blender.git] / source / blender / editors / transform / transform.c
index c1c812e8c68d3f6121a647e5b59e6977d43cafb4..d8f02e48b64f4603b6cb5834854daf1c29d0e40d 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 */
@@ -1729,6 +1726,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()