[Bf-blender-cvs] [e5bc9fae54d] master: Fix penpressure for tablets that use libinput on linux

Jens Verwiebe noreply at git.blender.org
Sat Nov 24 18:26:30 CET 2018


Commit: e5bc9fae54d2906cdc49278ec148343869fede0c
Author: Jens Verwiebe
Date:   Sat Nov 24 18:23:57 2018 +0100
Branches: master
https://developer.blender.org/rBe5bc9fae54d2906cdc49278ec148343869fede0c

Fix penpressure for tablets that use libinput on linux

===================================================================

M	intern/ghost/intern/GHOST_SystemX11.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index c8984f0e280..06754bc9300 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -2231,6 +2231,7 @@ static BOOL is_stylus(const char *name, const char *type)
 		"stylus",
 		"wizardpen",
 		"acecad",
+		"pen",
 		NULL
 	};
 
@@ -2286,7 +2287,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;



More information about the Bf-blender-cvs mailing list