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>2015-12-29 16:42:49 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2016-01-02 01:25:37 +0300
commit5c682a901b2ae9acf656f19e5f9b470d957d71cc (patch)
tree18ffa9d0ed4164ce601c285c700642a26a3c6eb9 /intern/cycles/render/nodes.h
parent1991ee173865ed79a78b50afc3f7a46af472e9dd (diff)
Cycles: Add Saw option to the wave texture
This commit adds "Bands Saw" and "Rings Saw" to the options for the Wave texture node in Cycles, behaving similar to the Saw option in BI textures. Requested by @cekuhnen on BA. Reviewers: dingto, sergey Subscribers: cekuhnen Differential Revision: https://developer.blender.org/D1699
Diffstat (limited to 'intern/cycles/render/nodes.h')
-rw-r--r--intern/cycles/render/nodes.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 67943775b92..cede4205a6a 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -267,12 +267,15 @@ public:
virtual int get_group() { return NODE_GROUP_LEVEL_2; }
ustring type;
+ ustring profile;
static ShaderEnum type_enum;
+ static ShaderEnum profile_enum;
virtual bool equals(const ShaderNode *other) {
const WaveTextureNode *wave_node = (const WaveTextureNode*)other;
return TextureNode::equals(other) &&
- type == wave_node->type;
+ type == wave_node->type &&
+ profile == wave_node->profile;
}
};