[Bf-blender-cvs] [301433f] master: Fix OpenGL Context freeing

Campbell Barton noreply at git.blender.org
Mon Jan 12 15:46:44 CET 2015


Commit: 301433fe9d3864a454f0d27b9e3809e8e2c76da6
Author: Campbell Barton
Date:   Mon Jan 12 22:02:06 2015 +1100
Branches: master
https://developer.blender.org/rB301433fe9d3864a454f0d27b9e3809e8e2c76da6

Fix OpenGL Context freeing

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

M	intern/ghost/intern/GHOST_ContextCGL.mm

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

diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm
index 37fd4a3..0b290c6 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -75,9 +75,10 @@ GHOST_ContextCGL::GHOST_ContextCGL(
 GHOST_ContextCGL::~GHOST_ContextCGL()
 {
 	if (m_openGLContext != nil) {
-		if (m_openGLContext == [NSOpenGLContext currentContext])
+		if (m_openGLContext == [NSOpenGLContext currentContext]) {
 			[NSOpenGLContext clearCurrentContext];
 			[m_openGLView clearGLContext];
+		}
 
 		if (m_openGLContext != s_sharedOpenGLContext || s_sharedCount == 1) {
 			assert(s_sharedCount > 0);




More information about the Bf-blender-cvs mailing list