Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Rishel <rishel.nick@gmail.com>2021-11-24 04:17:36 +0300
committerNicholas Rishel <rishel.nick@gmail.com>2021-11-24 04:17:36 +0300
commit21f22759ea84c583bc2ce8234c51a75b224984a5 (patch)
tree23c786f1d12a00bf2e11281e1ad667e738c4ff66
parent6b4405d7579da65c35d8f9424440d58002aa1f9c (diff)
parent60c0b7925625ad52824f2cb43d667fc3d56597a0 (diff)
Merge branch 'blender-v3.0-release'
-rw-r--r--intern/ghost/intern/GHOST_SystemWin32.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 5f5a89e2af1..e4630ad1ab5 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1002,10 +1002,10 @@ void GHOST_SystemWin32::processWintabEvent(GHOST_WindowWin32 *window)
DWORD pos = GetMessagePos();
int x = GET_X_LPARAM(pos);
int y = GET_Y_LPARAM(pos);
+ GHOST_TabletData td = wt->getLastTabletData();
- /* TODO supply tablet data */
system->pushEvent(new GHOST_EventCursor(
- system->getMilliSeconds(), GHOST_kEventCursorMove, window, x, y, GHOST_TABLET_DATA_NONE));
+ system->getMilliSeconds(), GHOST_kEventCursorMove, window, x, y, td));
}
}