diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-11-17 06:10:51 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-11-17 06:10:51 +0300 |
commit | 797dfa6a0a7d5d2bf62bdc03cf619addbc9e1064 (patch) | |
tree | 5a1e0f0a6b2439ceee4a8e0bae82b243e3831156 /source/blender/editors/render | |
parent | 09045ff64d1f0948489354bd097f2930f45bacb9 (diff) | |
parent | 75bd286813eb5e3c227696b4cfd5616b17166641 (diff) |
Merge branch 'blender-v2.91-release'
Conflicts:
source/blender/editors/render/render_opengl.c
source/blender/sequencer/intern/effects.c
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 79eaf007fcb..696c18d17c5 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -490,13 +490,13 @@ static void screen_opengl_render_apply(const bContext *C, OGLRender *oglrender) int chanshown = sseq ? sseq->chanshown : 0; SEQ_render_new_render_data(oglrender->bmain, - oglrender->depsgraph, - scene, - oglrender->sizex, - oglrender->sizey, - 100, - false, - &context); + oglrender->depsgraph, + scene, + oglrender->sizex, + oglrender->sizey, + SEQ_RENDER_SIZE_SCENE, + false, + &context); for (view_id = 0; view_id < oglrender->views_len; view_id++) { context.view_id = view_id; |