[Bf-blender-cvs] [6e65185] master: Fix for Ghost/OSX w/ core profile
Campbell Barton
noreply at git.blender.org
Mon Aug 17 08:23:46 CEST 2015
Commit: 6e65185854457d0ca335490418f1744bd75d95a3
Author: Campbell Barton
Date: Mon Aug 17 16:17:22 2015 +1000
Branches: master
https://developer.blender.org/rB6e65185854457d0ca335490418f1744bd75d95a3
Fix for Ghost/OSX w/ core profile
===================================================================
M intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index f1f38cc..9c7b5c3 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -1195,18 +1195,18 @@ GHOST_Context *GHOST_WindowCocoa::newDrawingContext(GHOST_TDrawingContextType ty
#if defined(WITH_GL_PROFILE_CORE)
GHOST_Context *context = new GHOST_ContextCGL(
- m_initStereoVisual,
- m_initNumOfAASamples,
+ m_wantStereoVisual,
+ m_wantNumOfAASamples,
m_window,
m_openGLView,
- CGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+ GL_CONTEXT_CORE_PROFILE_BIT,
3, 2,
GHOST_OPENGL_CGL_CONTEXT_FLAGS,
GHOST_OPENGL_CGL_RESET_NOTIFICATION_STRATEGY);
#elif defined(WITH_GL_PROFILE_ES20)
GHOST_Context *context = new GHOST_ContextCGL(
- m_initStereoVisual,
- m_initNumOfAASamples,
+ m_wantStereoVisual,
+ m_wantNumOfAASamples,
m_window,
m_openGLView,
CGL_CONTEXT_ES2_PROFILE_BIT_EXT,
More information about the Bf-blender-cvs
mailing list