[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60716] trunk/blender/intern/ghost/intern/ GHOST_DisplayManagerCocoa.mm: fix [#37059] OSX Debug - assert when using external screen with MacBookPro

Dalai Felinto dfelinto at gmail.com
Sat Oct 12 22:01:18 CEST 2013


Revision: 60716
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60716
Author:   dfelinto
Date:     2013-10-12 20:01:17 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
fix [#37059] OSX Debug - assert when using external screen with MacBookPro

This was old code, Blender now supports multiple screens.
The assert was breaking my builds with -DWITH_ASSERT_ABORT=ON

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

Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm	2013-10-12 18:11:54 UTC (rev 60715)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm	2013-10-12 20:01:17 UTC (rev 60716)
@@ -52,8 +52,6 @@
 
 GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const
 {
-	GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerCocoa::getNumDisplaySettings(): only main display is supported");
-	
 	numSettings = (GHOST_TInt32)3; //Width, Height, BitsPerPixel
 	
 	return GHOST_kSuccess;
@@ -62,11 +60,8 @@
 
 GHOST_TSuccess GHOST_DisplayManagerCocoa::getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const
 {
-	//Note that only current display setting is available
 	NSScreen *askedDisplay;
 	
-	GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerCocoa::getDisplaySetting(): only main display is supported");
-	
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	
 	if (display == kMainDisplay) //Screen #0 may not be the main one




More information about the Bf-blender-cvs mailing list