[Bf-blender-cvs] [8fbfc150a09] blender-v2.90-release: Fix T77885: crash rendering grease pencil from compositor with multiple scenes

[Vincent Blankfield]

Commit: 8fbfc150a097731c9a7a66a1c61a6d5a66973f14
Author: Vincent Blankfield
Date:   Thu Aug 6 17:04:10 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rB8fbfc150a097731c9a7a66a1c61a6d5a66973f14

Fix T77885: crash rendering grease pencil from compositor with multiple scenes

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

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 70c117d55b4..43025d9fef4 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1658,7 +1658,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;
 
   DRW_render_context_enable(render);
@@ -1680,7 +1679,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();

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs