[Bf-blender-cvs] [200de72d261] blender-v2.83-release: Fix T77885: crash rendering grease pencil from compositor with multiple scenes
Vincent Blankfield
noreply at git.blender.org
Wed Aug 12 09:44:11 CEST 2020
Commit: 200de72d26127685bb6e20ec01dc69a0201653e4
Author: Vincent Blankfield
Date: Thu Aug 6 17:04:10 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB200de72d26127685bb6e20ec01dc69a0201653e4
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 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();
More information about the Bf-blender-cvs
mailing list