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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-05-08 02:54:35 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-05-17 22:39:16 +0300
commit08670d3b8117cda608c178688f261e1204794a0d (patch)
tree4a82f0e7d2212bfc956619880d6b7cc168a2e7df /intern/cycles/render/nodes.h
parent93e4ae84ad31dc6a56fd249592b24007ea286ddc (diff)
Code refactor: use dynamic shader node array lengths now that OSL supports them.
Diffstat (limited to 'intern/cycles/render/nodes.h')
-rw-r--r--intern/cycles/render/nodes.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index ccfea033c12..8d3e2a58200 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -917,7 +917,7 @@ public:
virtual int get_group() { return NODE_GROUP_LEVEL_3; }
virtual bool equals(const ShaderNode * /*other*/) { return false; }
- float4 curves[RAMP_TABLE_SIZE];
+ array<float3> curves;
float min_x, max_x;
};
@@ -928,14 +928,15 @@ public:
virtual int get_group() { return NODE_GROUP_LEVEL_3; }
virtual bool equals(const ShaderNode * /*other*/) { return false; }
- float4 curves[RAMP_TABLE_SIZE];
+ array<float3> curves;
float min_x, max_x;
};
class RGBRampNode : public ShaderNode {
public:
SHADER_NODE_CLASS(RGBRampNode)
- float4 ramp[RAMP_TABLE_SIZE];
+ array<float3> ramp;
+ array<float> ramp_alpha;
bool interpolate;
virtual int get_group() { return NODE_GROUP_LEVEL_1; }
virtual bool equals(const ShaderNode * /*other*/) { return false; }