diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-27 16:32:19 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-27 16:32:19 +0300 |
commit | f54e076ae648507200993f251d51710acf0b1d68 (patch) | |
tree | 2eb6ad13670f139f189d6a6d9eecfffa585d4b3e /source/blender/editors/render/render_opengl.c | |
parent | 408515810e99d40a6dd53c3d50f1e4be7eb52c87 (diff) | |
parent | ef439a1f7e348599557fc14dfe738d4b093e2b6f (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 77535a65e58..3c63aed9473 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -706,9 +706,13 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) } } else if (is_sequencer) { - if (scene->r.seq_flag & R_SEQ_CAMERA_DOF) { - oglrender->fx = GPU_fx_compositor_create(); - } + /* NOTE: We allow animation of DoF setting for flexibility in edits, so + * we can't check in advance whether we need FX compositor or not. + * We just always allocated it and make sure it doesn't add extra + * overhead rather than memory allocation here if it's not really + * needed. + */ + oglrender->fx = GPU_fx_compositor_create(); } /* create render */ |