[Bf-blender-cvs] [b57ef11] soc-2014-viewport_context: there is no reason to not release native handles on OSX, so releaseNativeHandles should always succeed

Jason Wilkins noreply at git.blender.org
Sat Jul 26 04:05:21 CEST 2014


Commit: b57ef11e3d3dc84f34ac70f41ed4ebdcb837e509
Author: Jason Wilkins
Date:   Fri Jul 25 20:54:57 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rBb57ef11e3d3dc84f34ac70f41ed4ebdcb837e509

there is no reason to not release native handles on OSX, so releaseNativeHandles should always succeed

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

M	intern/ghost/intern/GHOST_ContextCGL.mm

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

diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm
index a7dfcae..b96a1dc 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -344,11 +344,8 @@ error:
 
 GHOST_TSuccess GHOST_ContextCGL::releaseNativeHandles()
 {
-	GHOST_TSuccess success = ((m_openGLContext != s_sharedOpenGLContext) ||
-	                          (s_sharedCount == 1 ? GHOST_kSuccess : GHOST_kFailure));
-
 	m_openGLContext = NULL;
 	m_openGLView    = NULL;
 
-	return success;
+	return GHOST_kSuccess;
 }




More information about the Bf-blender-cvs mailing list