[Bf-blender-cvs] [cbd4b8ebb05] master: Fix T76974: Shear Tool Misses Orientation

[Germano Cavalcante]

Commit: cbd4b8ebb054cacb97485b9e20e09c2bf3a34659
Author: Germano Cavalcante
Date:   Fri May 22 12:39:23 2020 -0300
Branches: master
https://developer.blender.org/rBcbd4b8ebb054cacb97485b9e20e09c2bf3a34659

Fix T76974: Shear Tool Misses Orientation

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

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

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

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 0614386530e..069e49088de 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1660,9 +1660,11 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 
     short orient_types[3];
     float custom_matrix[3][3];
+    bool use_orient_axis = false;
 
     if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis"))) {
       t->orient_axis = RNA_property_enum_get(op->ptr, prop);
+      use_orient_axis = true;
     }
     if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis_ortho"))) {
       t->orient_axis_ortho = RNA_property_enum_get(op->ptr, prop);
@@ -1683,7 +1685,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
       orient_types[2] = orient_type_scene;
     }
     else {
-      if ((t->flag & T_MODAL) && transform_mode_is_changeable(t->mode)) {
+      if ((t->flag & T_MODAL) && (use_orient_axis || transform_mode_is_changeable(t->mode))) {
         orient_types[0] = V3D_ORIENT_VIEW;
       }
       else {