[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31969] trunk/blender/intern/ghost/intern/ GHOST_WindowCocoa.mm: Fix OS X memory leak prints when starting blender:

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Sep 16 21:42:51 CEST 2010


Revision: 31969
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31969
Author:   blendix
Date:     2010-09-16 21:42:51 +0200 (Thu, 16 Sep 2010)

Log Message:
-----------
Fix OS X memory leak prints when starting blender:
"__NSAutoreleaseNoPool() ... autoreleased with no pool in place - just leaking"

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2010-09-16 19:03:01 UTC (rev 31968)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2010-09-16 19:42:51 UTC (rev 31969)
@@ -783,9 +783,9 @@
 			break;
 		case GHOST_kWindowStateNormal:
         default:
+			NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 			if (m_fullScreen)
 			{
-				NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 				m_fullScreen = false;
 
 				//Exit fullscreen
@@ -835,15 +835,15 @@
 			
 				//Tell WM of view new size
 				m_systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, this);
-				
-				[pool drain];
 			}
             else if ([m_window isMiniaturized])
 				[m_window deminiaturize:nil];
 			else if ([m_window isZoomed])
 				[m_window zoom:nil];
+			[pool drain];
             break;
     }
+
     return GHOST_kSuccess;
 }
 





More information about the Bf-blender-cvs mailing list