From ca4e8b423e81f2a72cd5409d1c2c0450e12afc78 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 Jan 2020 16:54:17 +0100 Subject: Cleanup: simplify wmEvent tablet data storage and naming Removing meaningless distinction between NULL pointer and EVT_TABLET_NONE, and initialize pressure and tilt to 1.0 and 0.0 respectively when no tablet is used. --- source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/windowmanager/gizmo') diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index 59975080f49..383ca806d35 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -1088,7 +1088,7 @@ void wm_gizmomap_modal_set( gz->state |= WM_GIZMO_STATE_MODAL; gzmap->gzmap_context.modal = gz; - if ((gz->flag & WM_GIZMO_MOVE_CURSOR) && (event->is_motion_absolute == false)) { + if ((gz->flag & WM_GIZMO_MOVE_CURSOR) && (event->tablet.is_motion_absolute == false)) { WM_cursor_grab_enable(win, WM_CURSOR_WRAP_XY, true, NULL); copy_v2_v2_int(gzmap->gzmap_context.event_xy, &event->x); gzmap->gzmap_context.event_grabcursor = win->grabcursor; -- cgit v1.2.3