Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Stockner <lukas.stockner@freenet.de>2018-06-14 18:48:19 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2018-06-14 23:21:37 +0300
commit3ee606621cf53a2a4897e534e7e04d3632f419f8 (patch)
treee8ffff99f0ceeea46aa170298853d8034a1acf1d /intern/cycles/render/constant_fold.h
parent064e701472ac430c8063ab5d577b5014eecf9ad5 (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/constant_fold.h')
-rw-r--r--intern/cycles/render/constant_fold.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/render/constant_fold.h b/intern/cycles/render/constant_fold.h
index 33f93b8c0ab..cc24d614206 100644
--- a/intern/cycles/render/constant_fold.h
+++ b/intern/cycles/render/constant_fold.h
@@ -22,6 +22,7 @@
CCL_NAMESPACE_BEGIN
+class Scene;
class ShaderGraph;
class ShaderInput;
class ShaderNode;
@@ -33,7 +34,9 @@ public:
ShaderNode *const node;
ShaderOutput *const output;
- ConstantFolder(ShaderGraph *graph, ShaderNode *node, ShaderOutput *output);
+ Scene *scene;
+
+ ConstantFolder(ShaderGraph *graph, ShaderNode *node, ShaderOutput *output, Scene *scene);
bool all_inputs_constant() const;