Merge branch 'blender2.7'
[blender.git] / intern / ghost / intern / GHOST_WindowCocoa.mm
index 43695f3..3e481ab 100644 (file)
@@ -571,11 +571,6 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
        updateDrawingContext();
        activateDrawingContext();
 
-       if (m_systemCocoa->m_nativePixel) {
-               NSRect backingBounds = [m_openGLView convertRectToBacking:[m_openGLView bounds]];
-               m_nativePixelSize = (float)backingBounds.size.width / (float)rect.size.width;
-       }
-       
        setTitle(title);
        
        m_tablet.Active = GHOST_kTabletModeNone;
@@ -599,6 +594,8 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
        if (state == GHOST_kWindowStateFullScreen)
                setState(GHOST_kWindowStateFullScreen);
 
+       setNativePixelSize();
+
        [pool drain];
 }