From 64d40c82c324f7029e27ff59a4b1ca3200cddbef Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 11 Jul 2018 10:25:02 +0200 Subject: [PATCH] Revert "Transform: default constraint to user orientation" This reverts commit 81210103104980c9052de491a0b4defd003c2d1e. After user feedback this has the downside of having no predictable way of transforming in global space. Since toggling between global/user is reversed when global is the user axis. --- source/blender/editors/transform/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index db974c3b4db..15c830e45d0 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1036,12 +1036,12 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm } else if (!edit_2d) { if (cmode == axis) { - if (t->con.orientation != t->current_orientation) { + if (t->con.orientation != V3D_MANIP_GLOBAL) { stopConstraint(t); } else { - const short orientation = ( - (t->current_orientation != V3D_MANIP_GLOBAL) ? V3D_MANIP_GLOBAL : V3D_MANIP_LOCAL); + short orientation = (t->current_orientation != V3D_MANIP_GLOBAL ? + t->current_orientation : V3D_MANIP_LOCAL); if (is_plane == false) { setUserConstraint(t, orientation, constraint_axis, msg2); } @@ -1052,10 +1052,10 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm } else { if (is_plane == false) { - setUserConstraint(t, t->current_orientation, constraint_axis, msg2); + setUserConstraint(t, V3D_MANIP_GLOBAL, constraint_axis, msg2); } else { - setUserConstraint(t, t->current_orientation, constraint_plane, msg3); + setUserConstraint(t, V3D_MANIP_GLOBAL, constraint_plane, msg3); } } }