[Bf-blender-cvs] [a620501acbd] master: Fix T62152: Shear X and Y are swapped

[Campbell Barton]

Commit: a620501acbde3fe03ff31c8c5a45453200f0c361
Author: Campbell Barton
Date:   Tue Sep 3 20:32:15 2019 +1000
Branches: master
https://developer.blender.org/rBa620501acbde3fe03ff31c8c5a45453200f0c361

Fix T62152: Shear X and Y are swapped

===================================================================

M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform_ops.c

===================================================================

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 6478928a6b6..c344b6c8649 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -3520,7 +3520,7 @@ static void initShear_mouseInputMode(TransInfo *t)
     copy_v3_v3(dir, t->orient_matrix[t->orient_axis_ortho]);
   }
   else {
-    cross_v3_v3v3(dir, t->orient_matrix[t->orient_axis_ortho], t->orient_matrix[t->orient_axis]);
+    cross_v3_v3v3(dir, t->orient_matrix[t->orient_axis], t->orient_matrix[t->orient_axis_ortho]);
   }
 
   /* Without this, half the gizmo handles move in the opposite direction. */
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 1be206e921a..604c5bbc083 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -573,7 +573,7 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
   if (flags & P_ORIENT_AXIS_ORTHO) {
     prop = RNA_def_property(ot->srna, "orient_axis_ortho", PROP_ENUM, PROP_NONE);
     RNA_def_property_ui_text(prop, "Axis Ortho", "");
-    RNA_def_property_enum_default(prop, 1);
+    RNA_def_property_enum_default(prop, 0);
     RNA_def_property_enum_items(prop, rna_enum_axis_xyz_items);
     RNA_def_property_flag(prop, PROP_SKIP_SAVE);
   }