[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54048] trunk/blender/intern/ghost/intern/ GHOST_WindowX11.cpp: Fix compilation with WITH_X11_XINPUT=OFF
Sv. Lockal
lockalsash at gmail.com
Wed Jan 23 16:01:34 CET 2013
Revision: 54048
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54048
Author: lockal
Date: 2013-01-23 15:01:33 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Fix compilation with WITH_X11_XINPUT=OFF
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2013-01-23 14:55:41 UTC (rev 54047)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2013-01-23 15:01:33 UTC (rev 54048)
@@ -1211,11 +1211,13 @@
switch (type) {
case GHOST_kDrawingContextTypeOpenGL:
{
+#ifdef WITH_X11_XINPUT
/* use our own event handlers to avoid exiting blender,
* this would happen for eg:
* if you open blender, unplug a tablet, then open a new window. */
XErrorHandler old_handler = XSetErrorHandler(GHOST_X11_ApplicationErrorHandler);
XIOErrorHandler old_handler_io = XSetIOErrorHandler(GHOST_X11_ApplicationIOErrorHandler);
+#endif
m_context = glXCreateContext(m_display, m_visual, s_firstContext, True);
if (m_context != NULL) {
@@ -1231,10 +1233,11 @@
success = GHOST_kFailure;
}
+#ifdef WITH_X11_XINPUT
/* Restore handler */
(void) XSetErrorHandler(old_handler);
(void) XSetIOErrorHandler(old_handler_io);
-
+#endif
break;
}
case GHOST_kDrawingContextTypeNone:
More information about the Bf-blender-cvs
mailing list