diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:50:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:50:07 +0300 |
commit | f5d096798cda8cca34a31a4a4ce441cb655b982c (patch) | |
tree | 0c1b62d1fd1994b094ebe6608cdf8f3a88b8c085 /source/blender/compositor | |
parent | 8dff53898965b5ea07a99245071098207d3f197e (diff) | |
parent | 52655f51619d0ab06bbde6966c31d15f6ab4ab19 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
-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 4599832b433..ae9defa786e 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -88,7 +88,7 @@ void COM_execute(RenderData *rd, Scene *scene, bNodeTree *editingtree, int rende editingtree->progress(editingtree->prh, 0.0); editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing")); - bool twopass = (editingtree->flag & NTREE_TWO_PASS) > 0 && !rendering; + bool twopass = (editingtree->flag & NTREE_TWO_PASS) && !rendering; /* initialize execution system */ if (twopass) { ExecutionSystem *system = new ExecutionSystem(rd, scene, editingtree, rendering, twopass, viewSettings, displaySettings, viewName); |