Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2019-05-23 13:10:25 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-05-23 13:58:50 +0300
commite9cf9e0a397f9589e00d980f0c0489641e7ed57e (patch)
tree8f17ea5031d8df7412e0ceb52d27f074f7af4f8f /source/blender/draw/intern/draw_manager.c
parent481e13a2dd05cef48815f97665474e2585d7de32 (diff)
Gpencil: Fix assert when rendering with Eevee
Diffstat (limited to 'source/blender/draw/intern/draw_manager.c')
-rw-r--r--source/blender/draw/intern/draw_manager.c5
1 files changed, 5 insertions, 0 deletions
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;