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:
authorVincent Blankfield <vvv>2020-08-06 18:04:10 +0300
committerJeroen Bakker <jeroen@blender.org>2020-08-12 10:39:15 +0300
commit200de72d26127685bb6e20ec01dc69a0201653e4 (patch)
tree3748b694230940af7a29fba445bda0aed8aed22e
parent5d42024be6765bfd2f7dfe69dab97c7101e28dae (diff)
Fix T77885: crash rendering grease pencil from compositor with multiple scenes
-rw-r--r--source/blender/draw/intern/draw_manager.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 9f84d47a4fb..862c84a2022 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1650,7 +1650,6 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph
Scene *scene = DEG_get_evaluated_scene(depsgraph);
ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
RenderEngineType *engine_type = engine->type;
- RenderData *r = &scene->r;
Render *render = engine->re;
/* Changing Context */
if (G.background && DST.gl_context == NULL) {
@@ -1688,7 +1687,7 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph
drw_context_state_init();
DST.viewport = GPU_viewport_create();
- const int size[2] = {(r->size * r->xsch) / 100, (r->size * r->ysch) / 100};
+ const int size[2] = {engine->resolution_x, engine->resolution_y};
GPU_viewport_size_set(DST.viewport, size);
drw_viewport_var_init();