From c828a505c2e0987beed7a2a1803b05c1eb374ce2 Mon Sep 17 00:00:00 2001
From: Germano Cavalcante <germano.costa@ig.com.br>
Date: Sat, 30 Jan 2021 12:49:42 -0300
Subject: Revert "Fix T83092: Direction of rotation with View orientation
 changed in 2.91"

This reverts commit f9e994d0f463abb87761591e30c47a9613be6cca.
And fixes T85227.

That commit created an inverted orientation matrix but the 'Align to
Transform Orientation' operator doesn't work well with inverted matrices.
---
 source/blender/editors/transform/transform_gizmo_3d.c     | 4 ++--
 source/blender/editors/transform/transform_mode_shear.c   | 4 ++--
 source/blender/editors/transform/transform_orientations.c | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index 3c82365fdb4..b5399b208e2 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -1336,7 +1336,7 @@ void drawDial3d(const TransInfo *t)
     }
     else {
       axis_idx = MAN_AXIS_ROT_C;
-      negate_v3_v3(mat_basis[2], t->spacemtx[t->orient_axis]);
+      copy_v3_v3(mat_basis[2], t->spacemtx[t->orient_axis]);
       scale *= 1.2f;
       line_with -= 1.0f;
     }
@@ -1384,7 +1384,7 @@ void drawDial3d(const TransInfo *t)
                                     false,
                                     &(struct Dial3dParams){
                                         .draw_options = ED_GIZMO_DIAL_DRAW_FLAG_ANGLE_VALUE,
-                                        .angle_delta = t->values_final[0],
+                                        .angle_delta = t->values[0],
                                         .angle_increment = increment,
                                     });
 
diff --git a/source/blender/editors/transform/transform_mode_shear.c b/source/blender/editors/transform/transform_mode_shear.c
index 0ccea9c396e..a41c49710b9 100644
--- a/source/blender/editors/transform/transform_mode_shear.c
+++ b/source/blender/editors/transform/transform_mode_shear.c
@@ -56,12 +56,12 @@ static void initShear_mouseInputMode(TransInfo *t)
   /* Needed for axis aligned view gizmo. */
   if (t->orient[t->orient_curr].type == V3D_ORIENT_VIEW) {
     if (t->orient_axis_ortho == 0) {
-      if (t->center2d[1] < t->mouse.imval[1]) {
+      if (t->center2d[1] > t->mouse.imval[1]) {
         dir_flip = !dir_flip;
       }
     }
     else if (t->orient_axis_ortho == 1) {
-      if (t->center2d[0] < t->mouse.imval[0]) {
+      if (t->center2d[0] > t->mouse.imval[0]) {
         dir_flip = !dir_flip;
       }
     }
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index 90b2ce2a385..3b39f4d06ad 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -561,7 +561,6 @@ short ED_transform_calc_orientation_from_type_ex(const bContext *C,
       if (rv3d != NULL) {
         copy_m3_m4(r_mat, rv3d->viewinv);
         normalize_m3(r_mat);
-        negate_v3(r_mat[2]);
       }
       else {
         unit_m3(r_mat);
-- 
cgit v1.2.3