[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25706] trunk/blender/intern/ghost/intern/ GHOST_WindowX11.cpp: Fix #20558: open file with new window setup corrupts text and icons in the UI.

Brecht Van Lommel brecht at blender.org
Mon Jan 4 17:26:03 CET 2010


Revision: 25706
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25706
Author:   blendix
Date:     2010-01-04 17:26:03 +0100 (Mon, 04 Jan 2010)

Log Message:
-----------
Fix #20558: open file with new window setup corrupts text and icons in the UI.

On X11, the opengl context was destroyed when closing a window. This lead to
the text and icon textures being lost (among other things), now the opengl
context is kept like on Win/Mac.

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	2010-01-04 15:37:22 UTC (rev 25705)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2010-01-04 16:26:03 UTC (rev 25706)
@@ -1226,10 +1226,7 @@
 	if(m_xtablet.EraserDevice)
 		XCloseDevice(m_display, m_xtablet.EraserDevice);
 	
-	if (m_context) {
-		if (m_context == s_firstContext) {
-			s_firstContext = NULL;
-		}
+	if (m_context != s_firstContext) {
 		glXDestroyContext(m_display, m_context);
 	}
 	





More information about the Bf-blender-cvs mailing list