[Bf-blender-cvs] [e9e608d23e6] T90952: Attempt fix T90952
Nicholas Rishel
noreply at git.blender.org
Sat Sep 11 01:41:09 CEST 2021
Commit: e9e608d23e64e76e14c526e075ae5c543f20aa91
Author: Nicholas Rishel
Date: Fri Sep 10 16:40:38 2021 -0700
Branches: T90952
https://developer.blender.org/rBe9e608d23e64e76e14c526e075ae5c543f20aa91
Attempt fix T90952
===================================================================
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_Wintab.cpp
===================================================================
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. */
More information about the Bf-blender-cvs
mailing list