diff options
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 6 |
2 files changed, 5 insertions, 3 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"); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 07bf0d12092..9477f99e826 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -5779,8 +5779,10 @@ static void rna_def_userdef_input(BlenderRNA *brna) prop = RNA_def_property(srna, "tablet_api", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, tablet_api); - RNA_def_property_ui_text( - prop, "Tablet API", "Select the tablet API to use for pressure sensitivity"); + RNA_def_property_ui_text(prop, + "Tablet API", + "Select the tablet API to use for pressure sensitivity (restart " + "Blender for changes to take effect)"); RNA_def_property_update(prop, 0, "rna_userdef_tablet_api_update"); # ifdef WITH_INPUT_NDOF |