diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2013-10-13 00:01:17 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2013-10-13 00:01:17 +0400 |
| commit | fa873f956c12c26555b46626c2d2c9595352aca1 (patch) | |
| tree | f95d3e36391425f4946a7dc164daee6e232fe6c5 /intern | |
| parent | 3e79a0a5e0cd1cc080ffae17528914d812861f28 (diff) | |
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
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_DisplayManagerCocoa.mm | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm index 88f338c0649..876be90025f 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm @@ -52,8 +52,6 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::getNumDisplays(GHOST_TUns8& numDisplay 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::getNumDisplaySettings(GHOST_TUns8 disp 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 |