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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-12-18 16:30:00 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-12-18 17:07:04 +0300
commit8c4ae8961cb2447cce64667b5dc40785f3b4709a (patch)
tree05c35eeea0764d6aa24add71c8edf6e119559d15 /intern
parent72456ee1987c458caab9cdb15265898564a5f775 (diff)
Fix T59564: Huion pen pressure not working on Linux, after recent changes.
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_SystemX11.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index ce056ef2c62..e53379a4f22 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -2356,10 +2356,7 @@ void GHOST_SystemX11::refreshXInputDevices()
GHOST_TTabletMode tablet_mode = tablet_mode_from_name(device_info[i].name, device_type);
- if ((m_xtablet.StylusDevice == NULL) &&
- ((tablet_mode == GHOST_kTabletModeStylus) && (device_info[i].type != m_atom.TABLET)))
- /* for libinput to work reliable, only lookup ValuatorClass in Tablet type:'STYLUS' */
- {
+ if ((m_xtablet.StylusDevice == NULL) && (tablet_mode == GHOST_kTabletModeStylus)) {
// printf("\tfound stylus\n");
m_xtablet.StylusID = device_info[i].id;
m_xtablet.StylusDevice = XOpenDevice(m_display, m_xtablet.StylusID);
@@ -2386,7 +2383,7 @@ void GHOST_SystemX11::refreshXInputDevices()
m_xtablet.YtiltLevels = 0;
}
- found_valuator_class = true;
+ found_valuator_class = (m_xtablet.PressureLevels > 0);
break;
}