diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:53 +0300 |
| commit | 059c119719e04283808d3c7076886e1a58874f6b (patch) | |
| tree | 5296776b81111ef62e33687d4a9b4c6ab5e297ff /intern/ghost | |
| parent | fa0fcbe4d6ca3f183f02395fe9ba18fb5ea87748 (diff) | |
| parent | e742e0934de6384eeaf271ca4cfe99922ddbe3fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 37a2c50c442..344e893bb08 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -2329,6 +2329,7 @@ static BOOL is_stylus(const char *name, const char *type) "stylus", "wizardpen", "acecad", + "pen", NULL }; @@ -2384,7 +2385,8 @@ void GHOST_SystemX11::refreshXInputDevices() if ((m_xtablet.StylusDevice == NULL) && - (is_stylus(device_info[i].name, device_type) || (device_info[i].type == m_atom.TABLET))) + (is_stylus(device_info[i].name, device_type) && (device_info[i].type != m_atom.TABLET))) + /* for libinput to work reliable, only lookup ValuatorClass in Tablet type:'STYLUS' */ { // printf("\tfound stylus\n"); m_xtablet.StylusID = device_info[i].id; |