blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Campbell Barton 2021-04-30 23:13:34 +10:00
parent 95d2d0d35a 0d07cfd940
commit 8f27ea40d6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -627,12 +627,23 @@ static int snap_gizmo_test_select(bContext *C, wmGizmo *gz, const int mval[2])
{
SnapGizmo3D *snap_gizmo = (SnapGizmo3D *)gz;
wmWindowManager *wm = CTX_wm_manager(C);
ARegion *region = CTX_wm_region(C);
/* FIXME: this hack is to ignore drag events, otherwise drag events
* cause momentary snap gizmo re-positioning at the drag-start location, see: T87511. */
if (wm && wm->winactive) {
const wmEvent *event = wm->winactive->eventstate;
int mval_compare[2] = {event->x - region->winrct.xmin, event->y - region->winrct.ymin};
if (!equals_v2v2_int(mval_compare, mval)) {
return snap_gizmo->snap_elem ? 0 : -1;
}
}
if (!eventstate_has_changed(snap_gizmo, wm)) {
/* Performance, do not update. */
return snap_gizmo->snap_elem ? 0 : -1;
}
ARegion *region = CTX_wm_region(C);
View3D *v3d = CTX_wm_view3d(C);
const float mval_fl[2] = {UNPACK2(mval)};
short snap_elem = ED_gizmotypes_snap_3d_update(