[Bf-blender-cvs] [567212c3434] master: Fix T74846: UV gizmo swaps X/Y

Campbell Barton noreply at git.blender.org
Wed Mar 25 11:52:14 CET 2020


Commit: 567212c3434ad1ca851769fd8616ee2b1bd725ae
Author: Campbell Barton
Date:   Wed Mar 25 19:40:52 2020 +1100
Branches: master
https://developer.blender.org/rB567212c3434ad1ca851769fd8616ee2b1bd725ae

Fix T74846: UV gizmo swaps X/Y

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

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 dce2625e8a1..e85b9f0bee1 100644
--- a/source/blender/editors/transform/transform_gizmo_2d.c
+++ b/source/blender/editors/transform/transform_gizmo_2d.c
@@ -300,7 +300,7 @@ static void gizmo2d_xform_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup
       /* set up widget data */
       RNA_float_set(gz->ptr, "length", 0.8f);
       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);
 
       float offset[3] = {0, 0, 0};
@@ -336,8 +336,8 @@ static void gizmo2d_xform_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup
     /* Assign operator. */
     PointerRNA *ptr = WM_gizmo_operator_set(gz, 0, ot_translate, 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);
       }



More information about the Bf-blender-cvs mailing list