archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert "Transform: default constraint to user orientation"

Browse Source 
This reverts commit 8121010310.

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.
This commit is contained in:
Campbell Barton
2018-07-11 10:25:02 +02:00
parent ed66388c87
commit 64d40c82c3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/transform/transform.c
View File

@@ -1036,12 +1036,12 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm
} }
else if (!edit_2d) { else if (!edit_2d) {
if (cmode == axis) { if (cmode == axis) {
if (t->con.orientation != t->current_orientation) { if (t->con.orientation != V3D_MANIP_GLOBAL) {
stopConstraint(t); stopConstraint(t);
} }
else { else {
const short orientation = ( short orientation = (t->current_orientation != V3D_MANIP_GLOBAL ?
(t->current_orientation != V3D_MANIP_GLOBAL) ? V3D_MANIP_GLOBAL : V3D_MANIP_LOCAL); t->current_orientation : V3D_MANIP_LOCAL);
if (is_plane == false) { if (is_plane == false) {
setUserConstraint(t, orientation, constraint_axis, msg2); setUserConstraint(t, orientation, constraint_axis, msg2);
} }
@@ -1052,10 +1052,10 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm
} }
else { else {
if (is_plane == false) { if (is_plane == false) {
setUserConstraint(t, t->current_orientation, constraint_axis, msg2); setUserConstraint(t, V3D_MANIP_GLOBAL, constraint_axis, msg2);
} }
else { else {
setUserConstraint(t, t->current_orientation, constraint_plane, msg3); setUserConstraint(t, V3D_MANIP_GLOBAL, constraint_plane, msg3);
} }
} }
} }