Merged changes in the trunk up to revision 41768.
[blender-staging.git] / source / blender / editors / transform / transform.c
index 5060f55c533506c492c2fd3d6b3dfbc9ba20fae7..a50a1a6910ee3b435e2dfb0d329800a1e3177265 100644 (file)
@@ -570,9 +570,6 @@ int transformEvent(TransInfo *t, wmEvent *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 */
@@ -1758,6 +1755,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()