diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-28 14:05:51 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-28 14:05:51 +0300 |
| commit | 409a21b32e11773f6eb32596430f0fcc70faf2fe (patch) | |
| tree | 68b7b901694f24cf42c79d15bc5cc75fee1b011a /intern/ghost | |
| parent | 66e6cd53157274e0384b65ff6a437d2dcf6d3a9f (diff) | |
| parent | d918217d35b687f174711d9ae35b8270909f1e28 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 43695f3f774..3e481ab93d0 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -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]; } |