diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-06 15:31:40 +0400 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-06 15:31:40 +0400 |
| commit | 28f7bfa8dfd691a1af7966ed3f8358479f069adf (patch) | |
| tree | ed840647be5df4c32910d70e8557200804b1f850 /source/blender/compositor/intern/COM_compositor.cpp | |
| parent | 27da686aece8940aedcd99ac9f8a08f63af7f539 (diff) | |
* Added OpenCL implementation of the Defocus node
* Always disable two phase compositing during rendering
- At Mind -
Diffstat (limited to 'source/blender/compositor/intern/COM_compositor.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_compositor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |