[Bf-blender-cvs] [1b326792846] blender-v2.92-release: Fix T85169: UV scale gizmo swaps X/Y

[Philipp Oeser]

Commit: 1b32679284628339c181de9f93d8904288cf4816
Author: Philipp Oeser
Date:   Fri Jan 29 12:33:57 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rB1b32679284628339c181de9f93d8904288cf4816

Fix T85169: UV scale gizmo swaps X/Y

Introduced with swapped axis in rB0d67eb277f9b.
Similar was fixed for the translate gizmo in rB567212c3434a.
Now do the same for scaling as well.

Maniphest Tasks: T85169

Differential Revision: https://developer.blender.org/D10245

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

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

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

diff --git a/source/blender/editors/transform/transform_gizmo_2d.c b/source/blender/editors/transform/transform_gizmo_2d.c
index 09100bb50cc..0b677e2560b 100644
--- a/source/blender/editors/transform/transform_gizmo_2d.c
+++ b/source/blender/editors/transform/transform_gizmo_2d.c
@@ -618,7 +618,7 @@ static void gizmo2d_resize_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgrou
       /* set up widget data */
       RNA_float_set(gz->ptr, "length", 1.0f);
       float axis[3] = {0.0f};
-      axis[(i + 1) % 2] = 1.0f;
+      axis[i] = 1.0f;
       WM_gizmo_set_matrix_rotation_from_z_axis(gz, axis);
 
       RNA_enum_set(gz->ptr, "draw_style", ED_GIZMO_ARROW_STYLE_BOX);
@@ -651,8 +651,8 @@ static void gizmo2d_resize_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgrou
     /* Assign operator. */
     PointerRNA *ptr = WM_gizmo_operator_set(gz, 0, ot_resize, NULL);
     if (i < 2) {
-      bool constraint[3] = {0};
-      constraint[(i + 1) % 2] = 1;
+      bool constraint[3] = {false};
+      constraint[i] = true;
       if (RNA_struct_find_property(ptr, "constraint_axis")) {
         RNA_boolean_set_array(ptr, "constraint_axis", constraint);
       }