[Bf-blender-cvs] [e9cf9e0a397] master: Gpencil: Fix assert when rendering with Eevee

[Clément Foucault]

Commit: e9cf9e0a397f9589e00d980f0c0489641e7ed57e
Author: Clément Foucault
Date:   Thu May 23 12:10:25 2019 +0200
Branches: master
https://developer.blender.org/rBe9cf9e0a397f9589e00d980f0c0489641e7ed57e

Gpencil: Fix assert when rendering with Eevee

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

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 be046abfc8c..718dd355445 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1975,6 +1975,11 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph)
     /* grease pencil: render result is merged in the previous render result. */
     if (DRW_render_check_grease_pencil(depsgraph)) {
       DRW_state_reset();
+      /* HACK: this is just for sanity and not trigger asserts. */
+      DST.view_default = NULL;
+      DST.view_active = NULL;
+      DST.view_previous = NULL;
+
       DRW_render_gpencil_to_image(engine, render_layer, &render_rect);
     }
     DST.buffer_finish_called = false;