← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to intern/ghost/intern/GHOST_DisplayManagerCocoa.mm

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
101
101
        NSScreen *askedDisplay;
102
102
        
103
103
        GHOST_ASSERT((display==kMainDisplay), "GHOST_DisplayManagerCocoa::getCurrentDisplaySetting(): only main display is supported");
104
 
    
105
 
        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];     
 
104
 
 
105
        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
106
106
 
107
107
        if (display == kMainDisplay) //Screen #0 may not be the main one
108
108
                askedDisplay = [NSScreen mainScreen];
162
162
#endif // GHOST_DEBUG
163
163
 
164
164
        //CGDisplayErr err = ::CGDisplaySwitchToMode(m_displayIDs[display], displayModeValues);
165
 
        
 
165
 
166
166
        return /*err == CGDisplayNoErr ?*/ GHOST_kSuccess /*: GHOST_kFailure*/;
167
167
}