Cycles: procedural texture nodes reorganization. This will break existing files

using them, but rather do it now that I have the chance still. Highlights:

* Wood and Marble merged into a single Wave texture
* Clouds + Distorted Noise merged into new Noise node
* Blend renamed to Gradient
* Stucci removed, was mostly useful for old bump
* Noise removed, will come back later, didn't actually work yet
* Depth setting is now Detail socket, which accepts float values
* Scale socket instead of Size socket

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures

1 files changed, 10 insertions, 70 deletions

diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 09b565b5043..d9cbd7ff589 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -97,41 +97,25 @@ public:
 	SHADER_NODE_CLASS(OutputNode)
 };
 
-class NoiseTextureNode : public TextureNode {
-public:
-	SHADER_NODE_CLASS(NoiseTextureNode)
-};
-
-class BlendTextureNode : public TextureNode {
+class GradientTextureNode : public TextureNode {
 public:
-	SHADER_NODE_CLASS(BlendTextureNode)
+	SHADER_NODE_CLASS(GradientTextureNode)
 
-	ustring progression;
-	ustring axis;
-
-	static ShaderEnum progression_enum;
-	static ShaderEnum axis_enum;
+	ustring type;
+	static ShaderEnum type_enum;
 };
 
-class CloudsTextureNode : public TextureNode {
+class NoiseTextureNode : public TextureNode {
 public:
-	SHADER_NODE_CLASS(CloudsTextureNode)
-
-	bool hard;
-	int depth;
-	ustring basis;
-
-	static ShaderEnum basis_enum;
+	SHADER_NODE_CLASS(NoiseTextureNode)
 };
 
 class VoronoiTextureNode : public TextureNode {
 public:
 	SHADER_NODE_CLASS(VoronoiTextureNode)
 
-	ustring distance_metric;
 	ustring coloring;
 
-	static ShaderEnum distance_metric_enum;
 	static ShaderEnum coloring_enum;
 };
 
@@ -140,25 +124,16 @@ public:
 	SHADER_NODE_CLASS(MusgraveTextureNode)
 
 	ustring type;
-	ustring basis;
 
 	static ShaderEnum type_enum;
-	static ShaderEnum basis_enum;
 };
 
-class MarbleTextureNode : public TextureNode {
+class WaveTextureNode : public TextureNode {
 public:
-	SHADER_NODE_CLASS(MarbleTextureNode)
+	SHADER_NODE_CLASS(WaveTextureNode)
 
 	ustring type;
-	ustring wave;
-	ustring basis;
-	bool hard;
-	int depth;
-
 	static ShaderEnum type_enum;
-	static ShaderEnum wave_enum;
-	static ShaderEnum basis_enum;
 };
 
 class MagicTextureNode : public TextureNode {
@@ -168,41 +143,6 @@ public:
 	int depth;
 };
 
-class StucciTextureNode : public TextureNode {
-public:
-	SHADER_NODE_CLASS(StucciTextureNode)
-
-	ustring type;
-	ustring basis;
-	bool hard;
-
-	static ShaderEnum type_enum;
-	static ShaderEnum basis_enum;
-};
-
-class DistortedNoiseTextureNode : public TextureNode {
-public:
-	SHADER_NODE_CLASS(DistortedNoiseTextureNode)
-
-	ustring basis;
-	ustring distortion_basis;
-	static ShaderEnum basis_enum;
-};
-
-class WoodTextureNode : public TextureNode {
-public:
-	SHADER_NODE_CLASS(WoodTextureNode)
-
-	ustring type;
-	ustring wave;
-	ustring basis;
-	bool hard;
-
-	static ShaderEnum type_enum;
-	static ShaderEnum wave_enum;
-	static ShaderEnum basis_enum;
-};
-
 class MappingNode : public ShaderNode {
 public:
 	SHADER_NODE_CLASS(MappingNode)
@@ -365,9 +305,9 @@ public:
 	SHADER_NODE_CLASS(FresnelNode)
 };
 
-class BlendWeightNode : public ShaderNode {
+class LayerWeightNode : public ShaderNode {
 public:
-	SHADER_NODE_CLASS(BlendWeightNode)
+	SHADER_NODE_CLASS(LayerWeightNode)
 };
 
 class MathNode : public ShaderNode {