diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-08-18 13:15:46 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-08-18 15:28:59 +0300 |
commit | 1da0685076bbddaaa9eb20366f07b5d552f03eb4 (patch) | |
tree | 2729556dcaf38ac0cfa4359c777ac098f668afa8 /intern/cycles/render/nodes.cpp | |
parent | 673b1930d85bb9759a1297fa3d354f216dcd98da (diff) |
Cycles: add a Pass Node
The Pass struct is now a Node and the passes are moved from the Film
class to the Scene class.
The Pass Node only has `type` and `name` as sockets as those seem to be
the only properties settable by exporters (other properties are implicit
and depend on the pass type).
This is part of T79131.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D8591
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
-rw-r--r-- | intern/cycles/render/nodes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index a50544242f7..f62d64a7eb3 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -5910,9 +5910,9 @@ OutputAOVNode::OutputAOVNode() : ShaderNode(node_type) void OutputAOVNode::simplify_settings(Scene *scene) { - slot = scene->film->get_aov_offset(name.string(), is_color); + slot = scene->film->get_aov_offset(scene, name.string(), is_color); if (slot == -1) { - slot = scene->film->get_aov_offset(name.string(), is_color); + slot = scene->film->get_aov_offset(scene, name.string(), is_color); } if (slot == -1 || is_color) { |