From 3ee606621cf53a2a4897e534e7e04d3632f419f8 Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Thu, 14 Jun 2018 17:48:19 +0200 Subject: 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 --- intern/cycles/render/graph.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/cycles/render/graph.cpp') 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 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(); -- cgit v1.2.3