diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-05 13:56:50 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-05 14:00:17 +0300 |
| commit | f929c03791300eb330b0b50e4ac2ab6a4368213a (patch) | |
| tree | bc750eb3da06f3a861dd1a90387b1bee1019c5f4 /source/blender/editors/render/render_opengl.c | |
| parent | df877cc991357804430831739af9e76dd04d2a75 (diff) | |
| parent | caf5a325b014e77e8a19fb8e40a3780964b609b6 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/intern/camera.c
source/blender/editors/space_sequencer/sequencer_draw.c
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index b8c148949e0..1cf482f8c61 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -147,8 +147,10 @@ static void screen_opengl_render_apply(OGLRender *oglrender) int chanshown = sseq ? sseq->chanshown : 0; struct bGPdata *gpd = (sseq && (sseq->flag & SEQ_SHOW_GPENCIL)) ? sseq->gpd : NULL; - context = BKE_sequencer_new_render_data(oglrender->bmain->eval_ctx, oglrender->bmain, - scene, oglrender->sizex, oglrender->sizey, 100.0f); + BKE_sequencer_new_render_data( + oglrender->bmain->eval_ctx, oglrender->bmain, scene, + oglrender->sizex, oglrender->sizey, 100.0f, + &context); ibuf = BKE_sequencer_give_ibuf(&context, CFRA, chanshown); |