diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-28 02:01:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-28 02:15:02 +0300 |
commit | 6491d50d02b7c93b4955fe05dae62930f3a76ce1 (patch) | |
tree | 31b1513e33760b716a16366266dbd4e7f37bdc32 /source/blender/editors/transform/transform_orientations.c | |
parent | 437d7d7cb9df3132d2e935f2b500f8669c17c4cc (diff) |
Transform: default to user-defined orientation
Previously we tried this but reverted (see 64d40c82c324)
because there wasn't a predictable set of keys to use global-space.
Now the keys are swapped:
- 'GX' always transforms in the user defined orientation.
- 'GXX' always transforms in global space.
As before 'GXXX' cycles back to disabling constraints.
This does have a down side that GXX won't be used for local-space
when the user has global space set.
Also, when global is the user-orientation, pressing GX and GXX
does the same thing.
Note: examples here use GX but could be any transform-mode/axis.
Diffstat (limited to 'source/blender/editors/transform/transform_orientations.c')
-rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 08f94cdfb2d..5be23594afd 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -432,7 +432,7 @@ void initTransformOrientation(bContext *C, TransInfo *t) Object *ob = CTX_data_active_object(C); Object *obedit = CTX_data_active_object(C); - switch (t->current_orientation) { + switch (t->orientation.user) { case V3D_MANIP_GLOBAL: unit_m3(t->spacemtx); BLI_strncpy(t->spacename, IFACE_("global"), sizeof(t->spacename)); @@ -492,9 +492,9 @@ void initTransformOrientation(bContext *C, TransInfo *t) BLI_strncpy(t->spacename, IFACE_("custom"), sizeof(t->spacename)); break; case V3D_MANIP_CUSTOM: - BLI_strncpy(t->spacename, t->custom_orientation->name, sizeof(t->spacename)); + BLI_strncpy(t->spacename, t->orientation.custom->name, sizeof(t->spacename)); - if (applyTransformOrientation(t->custom_orientation, t->spacemtx, t->spacename)) { + if (applyTransformOrientation(t->orientation.custom, t->spacemtx, t->spacename)) { /* pass */ } else { |