Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-04 19:26:03 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-04 19:26:03 +0300
commit50de143ca30ad8211668d5e74cbda46fc695348e (patch)
tree492fa6c2a55729a444319903ad513b6c9a8a070b /intern/ghost
parent589b2b4ca8af8a3b260c0dd33ddfdb0cc8ee8376 (diff)
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.
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_WindowX11.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index d9c2654f446..25d6c5980f6 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -1226,10 +1226,7 @@ GHOST_WindowX11::
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);
}