[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53869] trunk/blender: add NULL check for XInput device, since its possible only one is valid.

Campbell Barton ideasman42 at gmail.com
Thu Jan 17 03:06:59 CET 2013


Revision: 53869
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53869
Author:   campbellbarton
Date:     2013-01-17 02:06:54 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
add NULL check for XInput device, since its possible only one is valid.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    trunk/blender/source/blender/editors/interface/interface_widgets.c

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2013-01-17 01:48:42 UTC (rev 53868)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2013-01-17 02:06:54 UTC (rev 53869)
@@ -521,9 +521,15 @@
 #ifdef WITH_X11_XINPUT
 static bool checkTabletProximity(Display *display, XDevice *device)
 {
+	/* we could have true/false/not-found return value, but for now false is OK */
+
 	/* see: state.c from xinput, to get more data out of the device */
 	XDeviceState *state;
 
+	if (device == NULL) {
+		return false;
+	}
+
 	state = XQueryDeviceState(display, device);
 
 	if (state) {

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-01-17 01:48:42 UTC (rev 53868)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-01-17 02:06:54 UTC (rev 53869)
@@ -1798,7 +1798,7 @@
 	if ((state & UI_BUT_DISABLED) && (state & UI_ACTIVE)) {
 		widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.5f);
 		/* draw the backdrop at low alpha, helps navigating with keys
-		 * when inactive items are active */
+		 * when disabled items are active */
 		copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
 		wt->wcol.inner[3] = 64;
 	}




More information about the Bf-blender-cvs mailing list