[Bf-blender-cvs] [7fc2e33] blender2.8: small merge fix

[Mike Erwin]

Commit: 7fc2e333bb2632680c5061793e72e0c025231f51
Author: Mike Erwin
Date:   Fri Sep 23 18:12:24 2016 +0200
Branches: blender2.8
https://developer.blender.org/rB7fc2e333bb2632680c5061793e72e0c025231f51

small merge fix

Follow-up to rB1dfb89d22930

===================================================================

M       intern/ghost/intern/GHOST_ContextCGL.mm

===================================================================

diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm 
b/intern/ghost/intern/GHOST_ContextCGL.mm
index 1ab0301..64db701 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -187,6 +187,7 @@ GHOST_TSuccess GHOST_ContextCGL::updateDrawingContext()
 
 static void makeAttribList(
         std::vector<NSOpenGLPixelFormatAttribute>& attribs,
+        bool coreProfile, 
         bool stereoVisual,
         int numOfAASamples,
         bool needAlpha,
@@ -282,7 +283,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
        NSOpenGLPixelFormat *pixelFormat;
        // TODO: keep pixel format for subsequent windows/contexts instead of 
recreating each time
 
-       makeAttribList(attribs, coreProfile, m_stereoVisual, m_numOfAASamples, 
needAlpha, needStencil, softwareGL);
+       makeAttribList(attribs, m_coreProfile, m_stereoVisual, 
m_numOfAASamples, needAlpha, needStencil, softwareGL);
 
        pixelFormat = [[NSOpenGLPixelFormat alloc] 
initWithAttributes:&attribs[0]];
 
@@ -293,7 +294,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
                // (Now that I think about it, does WGL really require the code 
that it has for finding a lesser match?)
 
                attribs.clear();
-               makeAttribList(attribs, coreProfile, m_stereoVisual, 0, 
needAlpha, needStencil, softwareGL);
+               makeAttribList(attribs, m_coreProfile, m_stereoVisual, 0, 
needAlpha, needStencil, softwareGL);
                pixelFormat = [[NSOpenGLPixelFormat alloc] 
initWithAttributes:&attribs[0]];
        }
 
@@ -335,7 +336,7 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
                [m_openGLContext release];
 
                // create software GL context
-               makeAttribList(attribs, m_stereoVisual, m_numOfAASamples, 
needAlpha, needStencil, softwareGL);
+               makeAttribList(attribs, m_coreProfile, m_stereoVisual, 
m_numOfAASamples, needAlpha, needStencil, softwareGL);
                pixelFormat = [[NSOpenGLPixelFormat alloc] 
initWithAttributes:&attribs[0]];
                m_openGLContext = [[NSOpenGLContext alloc] 
initWithFormat:pixelFormat shareContext:s_sharedOpenGLContext];
                [pixelFormat release];

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs