[Bf-blender-cvs] [3daefd7e87c] temp-circle: Fix unreported: 2D Gizmo bounding box uses gizmo scale.

Chris Blackbourn noreply at git.blender.org
Thu Jun 9 03:05:25 CEST 2022


Commit: 3daefd7e87c1870fbeca3a4160da41aec684c67b
Author: Chris Blackbourn
Date:   Thu Jun 9 11:55:07 2022 +1200
Branches: temp-circle
https://developer.blender.org/rB3daefd7e87c1870fbeca3a4160da41aec684c67b

Fix unreported: 2D Gizmo bounding box uses gizmo scale.

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

M	source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c

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

diff --git a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
index a0e30c7518a..546157b95c2 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
@@ -315,10 +315,11 @@ static int gizmo_button2d_cursor_get(wmGizmo *gz)
   return WM_CURSOR_DEFAULT;
 }
 
+#define CIRCLE_RESOLUTION_3D 32
 static bool gizmo_button2d_bounds(bContext *C, wmGizmo *gz, rcti *r_bounding_box)
 {
   ScrArea *area = CTX_wm_area(C);
-  float rad = CIRCLE_RESOLUTION * U.dpi_fac / 2.0f;
+  float rad = CIRCLE_RESOLUTION_3D * U.dpi_fac / 2.0f;
   const float *co = NULL;
   float matrix_final[4][4];
   float co_proj[3];
@@ -342,6 +343,7 @@ static bool gizmo_button2d_bounds(bContext *C, wmGizmo *gz, rcti *r_bounding_box
     }
   }
   else {
+    rad = mat4_to_scale(matrix_final);
     co = matrix_final[3];
   }



More information about the Bf-blender-cvs mailing list