bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vincent Blankfield 2020-08-06 17:04:10 +02:00 committed by Brecht Van Lommel
parent cc3cb52b23
commit 8fbfc150a0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/intern/draw_manager.c
View File

@ -1658,7 +1658,6 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph
Scene *scene = DEG_get_evaluated_scene(depsgraph); Scene *scene = DEG_get_evaluated_scene(depsgraph);
ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph); ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
RenderEngineType *engine_type = engine->type; RenderEngineType *engine_type = engine->type;
RenderData *r = &scene->r;
Render *render = engine->re; Render *render = engine->re;
DRW_render_context_enable(render); DRW_render_context_enable(render);
@ -1680,7 +1679,7 @@ void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph
drw_context_state_init(); drw_context_state_init();
DST.viewport = GPU_viewport_create(); 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); GPU_viewport_size_set(DST.viewport, size);
drw_viewport_var_init(); drw_viewport_var_init();