diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-12-13 07:52:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-13 07:52:39 +0300 |
| commit | 6fc016d963248c5c0b07f118da356b469c42cc44 (patch) | |
| tree | 2c1a159672dd31515f78309322d8ac4e2c6a22fb | |
| parent | 123744e432cbdad77b251686b67d18dd190b8204 (diff) | |
Gizmo: fix button 2D hotspot size
Happened when used in 2D view.
| -rw-r--r-- | source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 7e6db43dbb3..ef3014eabc2 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c @@ -286,7 +286,7 @@ static int gizmo_button2d_test_select(bContext *C, wmGizmo *gz, const int mval[2 else { copy_v2_v2(point_local, (float[2]){UNPACK2(mval)}); sub_v2_v2(point_local, gz->matrix_basis[3]); - mul_v2_fl(point_local, 1.0f / (gz->scale_basis * UI_DPI_FAC)); + mul_v2_fl(point_local, 1.0f / gz->scale_final); } /* The 'gz->scale_final' is already applied when projecting. */ if (len_squared_v2(point_local) < 1.0f) { diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c index d6d3a3dc563..504b10888e8 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c @@ -466,7 +466,7 @@ static int gizmo_axis_test_select(bContext *UNUSED(C), wmGizmo *gz, const int mv { float point_local[2] = {UNPACK2(mval)}; sub_v2_v2(point_local, gz->matrix_basis[3]); - mul_v2_fl(point_local, 1.0f / (gz->scale_basis * UI_DPI_FAC)); + mul_v2_fl(point_local, 1.0f / gz->scale_final); const float len_sq = len_squared_v2(point_local); if (len_sq > 1.0) { |