Commit: da73f56917236c0633f31ce61ee11f9a0308afb1
Author: Clément Foucault
Date:   Fri Mar 8 14:31:58 2019 +0100
Branches: master
https://developer.blender.org/rBda73f56917236c0633f31ce61ee11f9a0308afb1

Fix T62355: Running blender 2.80 headless broken in recent builds

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

M       source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c 
b/source/blender/draw/intern/draw_manager.c
index 916cea87474..fe558746934 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2587,6 +2587,13 @@ void DRW_engines_register(void)
 
 void DRW_engines_free(void)
 {
+       if (DST.gl_context == NULL) {
+               /* Nothing has been setup. Nothing to clear.
+                * Otherwise, DRW_opengl_context_enable can
+                * create a context in background mode. (see T62355) */
+               return;
+       }
+
        DRW_opengl_context_enable();
 
        DRW_TEXTURE_FREE_SAFE(g_select_buffer.texture_depth);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to