[Bf-blender-cvs] [ef439a1f7e3] master: Sequencer: Fix missing FX compositor when starting rendering from frame with DoF disabled

Sergey Sharybin noreply at git.blender.org
Mon Nov 27 14:24:41 CET 2017


Commit: ef439a1f7e348599557fc14dfe738d4b093e2b6f
Author: Sergey Sharybin
Date:   Mon Nov 27 14:24:16 2017 +0100
Branches: master
https://developer.blender.org/rBef439a1f7e348599557fc14dfe738d4b093e2b6f

Sequencer: Fix missing FX compositor when starting rendering from frame with DoF disabled

===================================================================

M	source/blender/editors/render/render_opengl.c

===================================================================

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 */



More information about the Bf-blender-cvs mailing list