diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-27 16:08:35 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-27 16:08:35 +0300 |
| commit | 408515810e99d40a6dd53c3d50f1e4be7eb52c87 (patch) | |
| tree | 0aaf16e6011b472bb3b12d92c996268b58ec3080 /source/blender/editors/space_sequencer/sequencer_draw.c | |
| parent | 3bd6c8bfa256793170a21130d398c16da1192473 (diff) | |
| parent | 9b42b3e11462e96bf24970971ab181122c6b33df (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_draw.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 01b7c8793ba..399e76e71b8 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -58,6 +58,7 @@ #include "BIF_glutil.h" +#include "GPU_compositing.h" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_matrix.h" @@ -894,7 +895,7 @@ void ED_sequencer_special_preview_clear(void) ImBuf *sequencer_ibuf_get(struct Main *bmain, Scene *scene, SpaceSeq *sseq, int cfra, int frame_ofs, const char *viewname) { - SeqRenderData context; + SeqRenderData context = {0}; ImBuf *ibuf; int rectx, recty; float render_size; @@ -921,6 +922,12 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain, Scene *scene, SpaceSeq *sseq, int rectx, recty, proxy_size, &context); context.view_id = BKE_scene_multiview_view_id_get(&scene->r, viewname); + if (scene->r.seq_flag & R_SEQ_CAMERA_DOF) { + if (sseq->compositor == NULL) { + sseq->compositor = GPU_fx_compositor_create(); + } + context.gpu_fx = sseq->compositor; + } /* sequencer could start rendering, in this case we need to be sure it wouldn't be canceled * by Esc pressed somewhere in the past |