Merged changes in the trunk up to revision 46045.
[blender-staging.git] / source / blender / editors / transform / transform.c
index 233719033c73ff75d5ba1a95635def45eec49ec3..5fceb62b605b52b04af1d0b89db7ede87f11bc68 100644 (file)
@@ -586,9 +586,6 @@ int transformEvent(TransInfo *t, wmEvent *event)
        t->redraw |= handleMouseInput(t, &t->mouse, event);
 
        if (event->type == MOUSEMOVE) {
-               if (t->modifiers & MOD_CONSTRAINT_SELECT)
-                       t->con.mode |= CON_SELECT;
-
                copy_v2_v2_int(t->mval, event->mval);
 
                // t->redraw |= TREDRAW_SOFT; /* Use this for soft redraw. Might cause flicker in object mode */
@@ -1774,6 +1771,9 @@ void transformApply(bContext *C, TransInfo *t)
        t->context = C;
 
        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()