From 28f7bfa8dfd691a1af7966ed3f8358479f069adf Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 6 Jul 2012 11:31:40 +0000 Subject: * Added OpenCL implementation of the Defocus node * Always disable two phase compositing during rendering - At Mind - --- source/blender/compositor/intern/COM_compositor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/compositor/intern/COM_compositor.cpp') diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 9e48334bcca..ab64f8f7bf1 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -57,7 +57,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering) /* set progress bar to 0% and status to init compositing*/ editingtree->progress(editingtree->prh, 0.0); - bool twopass = (editingtree->flag&NTREE_TWO_PASS) > 0 || rendering; + bool twopass = (editingtree->flag&NTREE_TWO_PASS) > 0 && !rendering; /* initialize execution system */ if (twopass) { ExecutionSystem *system = new ExecutionSystem(rd, editingtree, rendering, twopass); -- cgit v1.2.3