diff options
| author | Cian Jinks <cjinks99@gmail.com> | 2021-09-22 17:09:31 +0300 |
|---|---|---|
| committer | Cian Jinks <cjinks99@gmail.com> | 2021-09-22 17:09:31 +0300 |
| commit | e734491048ef2436af41e272b8900f20785ecbe6 (patch) | |
| tree | 8cee3fc068c782c0ba8cb9a581e768968c565569 /source/blender/compositor/nodes/COM_ZCombineNode.cc | |
| parent | f21cd0881948f6eaf16af0b354cd904df7407bda (diff) | |
| parent | 204b01a254ac2445fea217e5211b2ed6aef631ca (diff) | |
Merge branch 'master' into soc-2021-knife-toolssoc-2021-knife-tools
Diffstat (limited to 'source/blender/compositor/nodes/COM_ZCombineNode.cc')
| -rw-r--r-- | source/blender/compositor/nodes/COM_ZCombineNode.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cc b/source/blender/compositor/nodes/COM_ZCombineNode.cc index ddf66740578..e29748dc317 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.cc +++ b/source/blender/compositor/nodes/COM_ZCombineNode.cc @@ -31,9 +31,9 @@ namespace blender::compositor { void ZCombineNode::convertToOperations(NodeConverter &converter, - const CompositorContext &context) const + const CompositorContext & /*context*/) const { - if ((context.getRenderData()->scemode & R_FULL_SAMPLE) || this->getbNode()->custom2) { + if (this->getbNode()->custom2) { ZCombineOperation *operation = nullptr; if (this->getbNode()->custom1) { operation = new ZCombineAlphaOperation(); |