[Bf-blender-cvs] [27cfd29] master: Fix copypaste error in x11 tablet init

Campbell Barton noreply at git.blender.org
Tue Feb 3 06:44:33 CET 2015


Commit: 27cfd291c6159285122f45219d78a2e4275a0429
Author: Campbell Barton
Date:   Tue Feb 3 16:37:37 2015 +1100
Branches: master
https://developer.blender.org/rB27cfd291c6159285122f45219d78a2e4275a0429

Fix copypaste error in x11 tablet init

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

M	intern/ghost/intern/GHOST_WindowX11.cpp

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

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 9c3392b..5e2a881 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -591,7 +591,7 @@ void GHOST_WindowX11::initXInputDevices()
 			if (xtablet.EraserDevice) {
 				DeviceMotionNotify(xtablet.EraserDevice, xtablet.MotionEvent, ev);
 				if (ev) xevents[dcount++] = ev;
-				DeviceButton1Motion(xtablet.StylusDevice, xtablet.MotionEvent, ev);
+				DeviceButton1Motion(xtablet.EraserDevice, xtablet.MotionEvent, ev);
 				if (ev) xevents[dcount++] = ev;
 				ProximityIn(xtablet.EraserDevice, xtablet.ProxInEvent, ev);
 				if (ev) xevents[dcount++] = ev;




More information about the Bf-blender-cvs mailing list