diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 18:48:19 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 23:21:37 +0300 |
| commit | 3ee606621cf53a2a4897e534e7e04d3632f419f8 (patch) | |
| tree | e8ffff99f0ceeea46aa170298853d8034a1acf1d /intern/cycles/render/graph.cpp | |
| parent | 064e701472ac430c8063ab5d577b5014eecf9ad5 (diff) | |
Cycles: Query XYZ to/from Scene Linear conversion from OCIO instead of assuming sRGB
I've limited it to just the RGB<->XYZ stuff for now, correct image handling is the next step.
Reviewers: brecht, sergey
Differential Revision: https://developer.blender.org/D3478
Diffstat (limited to 'intern/cycles/render/graph.cpp')
| -rw-r--r-- | intern/cycles/render/graph.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index e1c09373004..8b179f742c4 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -496,7 +496,7 @@ void ShaderGraph::remove_proxy_nodes() * Try to constant fold some nodes, and pipe result directly to * the input socket of connected nodes. */ -void ShaderGraph::constant_fold() +void ShaderGraph::constant_fold(Scene *scene) { ShaderNodeSet done, scheduled; queue<ShaderNode*> traverse_queue; @@ -536,7 +536,7 @@ void ShaderGraph::constant_fold() } } /* Optimize current node. */ - ConstantFolder folder(this, node, output); + ConstantFolder folder(this, node, output, scene); node->constant_fold(folder); } } @@ -734,7 +734,7 @@ void ShaderGraph::clean(Scene *scene) /* Graph simplification */ /* NOTE: Remove proxy nodes was already done. */ - constant_fold(); + constant_fold(scene); simplify_settings(scene); deduplicate_nodes(); verify_volume_output(); |