[Bf-blender-cvs] [b3bb17fe75c] greasepencil-object: GPencil: Fix crash when rendering in new window

[Clément Foucault]

Commit: b3bb17fe75c7b2820770a81052f27fc3daedd191
Author: Clément Foucault
Date:   Wed Feb 26 18:55:49 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb3bb17fe75c7b2820770a81052f27fc3daedd191

GPencil: Fix crash when rendering in new window

This was caused by an incorrect context switch.

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

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 26b13f13ff9..9ec015831b0 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1732,8 +1732,13 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph
   GPU_framebuffer_restore();
 
   /* Changing Context */
-  /* GPXX Review this context */
-  DRW_opengl_context_disable();
+  if (re_gl_context != NULL) {
+    DRW_gpu_render_context_disable(re_gpu_context);
+    DRW_opengl_render_context_disable(re_gl_context);
+  }
+  else {
+    DRW_opengl_context_disable();
+  }
 
   DST.buffer_finish_called = false;
 }