blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

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

This commit is contained in:
Vincent Blankfield 2020-08-06 17:04:10 +02:00 committed by Jeroen Bakker
parent 5d42024be6
commit 200de72d26
Notes: blender-bot 2023-02-14 08:29:54 +01:00 
Referenced by issue #77885, GPencil: Compositing different sized scenes with grease pencil crushes Blender
Referenced by issue #77348, Blender LTS: Maintenance Task 2.83
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

@ -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();