Attempt fix T90952T90952

2 files changed, 5 insertions, 2 deletions

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index f44107ee000..b4cbc693f94 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1003,9 +1003,11 @@ void GHOST_SystemWin32::processWintabEvent(GHOST_WindowWin32 *window)
     int x = GET_X_LPARAM(pos);
     int y = GET_Y_LPARAM(pos);
 
-    /* TODO supply tablet data */
+    /* TODO supply unmodified tablet data */
+    GHOST_TabletData td = wt->getLastTabletData();
+    td.Pressure = 1.0f;
     system->pushEvent(new GHOST_EventCursor(
-        system->getMilliSeconds(), GHOST_kEventCursorMove, window, x, y, GHOST_TABLET_DATA_NONE));
+        system->getMilliSeconds(), GHOST_kEventCursorMove, window, x, y, td));
   }
 }
 
diff --git a/intern/ghost/intern/GHOST_Wintab.cpp b/intern/ghost/intern/GHOST_Wintab.cpp
index cf0309b1521..6a66c77f890 100644
--- a/intern/ghost/intern/GHOST_Wintab.cpp
+++ b/intern/ghost/intern/GHOST_Wintab.cpp
@@ -150,6 +150,7 @@ void GHOST_Wintab::modifyContext(LOGCONTEXT &lc)
   lc.lcPktMode = PACKETMODE;
   lc.lcMoveMask = PACKETDATA;
   lc.lcOptions |= CXO_CSRMESSAGES | CXO_MESSAGES;
+  lc.lcBtnUpMask = lc.lcBtnDnMask = ~0;
 
   /* Tablet scaling is handled manually because some drivers don't handle HIDPI or multi-display
    * correctly; reset tablet scale factors to un-scaled tablet coordinates. */