diff options
author | Nicholas Rishel <nicholas_rishel> | 2020-10-01 13:02:21 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-10-01 13:05:36 +0300 |
commit | f18725662474e921fb31f2c8f80d1dc2e27ed065 (patch) | |
tree | 20a519c0f8619e6d091cab842b586b0fd57f477b /intern | |
parent | bcc6baec245a02a14392ae7ad22ca7c33fedef82 (diff) |
Windows: workaround to make Windows Ink tablet API work
Now Wintab is not initialized when starting Blender with the tablet API
preference set to native, since that disables Windows Ink.
Note that changing the tablet API requires restarting Blender for changes
to take effect. This serves as a stopgap to allow use of Windows Ink until
runtime API switching is merged.
Differential Revision: https://developer.blender.org/D9051
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 55525157753..18a48c9169e 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -299,7 +299,7 @@ GHOST_WindowWin32::GHOST_WindowWin32(GHOST_SystemWin32 *system, // Initialize Wintab m_wintab.handle = ::LoadLibrary("Wintab32.dll"); - if (m_wintab.handle) { + if (m_wintab.handle && m_system->getTabletAPI() != GHOST_kTabletNative) { // Get API functions m_wintab.info = (GHOST_WIN32_WTInfo)::GetProcAddress(m_wintab.handle, "WTInfoA"); m_wintab.open = (GHOST_WIN32_WTOpen)::GetProcAddress(m_wintab.handle, "WTOpenA"); |