blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix inversion of snapping failing in measure tool 

Comparison of event change has to be more specific and compare the x and y
values of the mouse as well.
This commit is contained in:
Germano Cavalcante 2021-04-03 13:32:42 -03:00
parent 62f8d9e478
commit 8681504f06
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
View File

@ -93,19 +93,24 @@ typedef struct SnapGizmo3D {
bool is_enabled;
} SnapGizmo3D;
static bool eventstate_cmp(SnapGizmo3D *snap_gizmo, const wmEvent *event)
{
if ((event->x == snap_gizmo->last_eventstate.x) && (event->y == snap_gizmo->last_eventstate.y) &&
(event->ctrl == snap_gizmo->last_eventstate.ctrl) &&
(event->shift == snap_gizmo->last_eventstate.shift) &&
(event->alt == snap_gizmo->last_eventstate.alt) &&
(event->oskey == snap_gizmo->last_eventstate.oskey)) {
return true;
}
return false;
}
/* Checks if the current event is different from the one captured in the last update. */
static bool eventstate_has_changed(SnapGizmo3D *snap_gizmo, const wmWindowManager *wm)
{
if (wm && wm->winactive) {
const wmEvent *event = wm->winactive->eventstate;
if ((event->x != snap_gizmo->last_eventstate.x) ||
(event->y != snap_gizmo->last_eventstate.y) ||
(event->ctrl != snap_gizmo->last_eventstate.ctrl) ||
(event->shift != snap_gizmo->last_eventstate.shift) ||
(event->alt != snap_gizmo->last_eventstate.alt) ||
(event->oskey != snap_gizmo->last_eventstate.oskey)) {
return true;
}
return eventstate_cmp(snap_gizmo, event) == false;
}
return false;
}
@ -132,10 +137,7 @@ static bool invert_snap(SnapGizmo3D *snap_gizmo, const wmWindowManager *wm)
}
const wmEvent *event = wm->winactive->eventstate;
if ((event->ctrl == snap_gizmo->last_eventstate.ctrl) &&
(event->shift == snap_gizmo->last_eventstate.shift) &&
(event->alt == snap_gizmo->last_eventstate.alt) &&
(event->oskey == snap_gizmo->last_eventstate.oskey)) {
if (eventstate_cmp(snap_gizmo, event)) {
/* Nothing has changed. */
return snap_gizmo->invert_snap;
}