[Bf-blender-cvs] [58e78c1ffe4] blender-v3.3-release: Fix T101298: Blender 3.3.1 crash on macOS due to merge error

Brecht Van Lommel noreply at git.blender.org
Fri Sep 23 17:55:41 CEST 2022


Commit: 58e78c1ffe4beec21a2a0df3e15ff9588aafc08d
Author: Brecht Van Lommel
Date:   Fri Sep 23 17:54:18 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB58e78c1ffe4beec21a2a0df3e15ff9588aafc08d

Fix T101298: Blender 3.3.1 crash on macOS due to merge error

Blender 3.3 is still using GLEW and needs this initialization.

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

M	intern/ghost/intern/GHOST_ContextCGL.mm

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

diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm
index 763bb6b86fa..d0fe12881b7 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -335,6 +335,8 @@ GHOST_TSuccess GHOST_ContextCGL::initializeDrawingContext()
     }
 #endif
 
+    initContextGLEW();
+
     if (m_metalView) {
       if (m_defaultFramebuffer == 0) {
         /* Create a virtual frame-buffer. */



More information about the Bf-blender-cvs mailing list