Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-27 16:24:16 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-27 16:24:16 +0300
commitef439a1f7e348599557fc14dfe738d4b093e2b6f (patch)
treee72a7ffc6beb0d8e4771bb14fbfcbd1df5e3375b /source/blender/editors/render/render_opengl.c
parent9b42b3e11462e96bf24970971ab181122c6b33df (diff)
Sequencer: Fix missing FX compositor when starting rendering from frame with DoF disabled
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
-rw-r--r--source/blender/editors/render/render_opengl.c10
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 b7a23bafced..1133b5f79d1 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -685,9 +685,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 */