blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Gizmo: fix button 2D hotspot size 

Happened when used in 2D view.
This commit is contained in:
Campbell Barton 2019-12-13 15:52:39 +11:00
parent 123744e432
commit 6fc016d963
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
View File

@ -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) {

2
source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
View File

@ -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) {