diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2020-05-01 15:31:20 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2020-05-01 15:32:22 +0300 |
commit | 185e1d53950faa9b56c812793f2bbda21d7489f8 (patch) | |
tree | ca525c913bc18eb126c0034d9e2a292ef268337e /source/blender/editors/transform/transform_orientations.c | |
parent | ae049a6c6ac545b2c9eadf759f40ad864f436ff1 (diff) |
Fix T76254: 'Normal' Transformation Orientation using Global
Issue introduced in rBc57e4418bb85.
Diffstat (limited to 'source/blender/editors/transform/transform_orientations.c')
-rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 3b1f3559daa..0edaf259f0e 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -438,11 +438,16 @@ static int armature_bone_transflags_update_recursive(bArmature *arm, return total; } -void initTransformOrientation(bContext *C, TransInfo *t, short orientation) +void initTransformOrientation(bContext *C, TransInfo *t) { Object *ob = CTX_data_active_object(C); Object *obedit = CTX_data_active_object(C); + /* Use the custom orientation when it is set. */ + short orientation = t->orientation.types[0] == V3D_ORIENT_CUSTOM_MATRIX ? + V3D_ORIENT_CUSTOM_MATRIX : + t->orientation.types[t->orientation.index]; + switch (orientation) { case V3D_ORIENT_GLOBAL: unit_m3(t->spacemtx); |