Cycles / Toon BSDF:

* Added a toon bsdf node to Cycles. This was already available as OSL only closure, but is now available inside the SVM backed as well, for CPU and GPU rendering. 
* There are 2 variations available, diffuse and glossy toon, selectable via a menu inside the node. 

Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#Toon

Example render & blend file:
http://www.pasteall.org/pic/show.php?id=51970
http://www.pasteall.org/blend/21579

1 files changed, 35 insertions, 0 deletions

diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 4d9fc356d80..84038f13270 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -1482,6 +1482,41 @@ void RefractionBsdfNode::compile(OSLCompiler& compiler)
 	compiler.add(this, "node_refraction_bsdf");
 }
 
+/* Toon BSDF Closure */
+
+static ShaderEnum toon_component_init()
+{
+	ShaderEnum enm;
+
+	enm.insert("Diffuse", CLOSURE_BSDF_DIFFUSE_TOON_ID);
+	enm.insert("Glossy", CLOSURE_BSDF_GLOSSY_TOON_ID);
+
+	return enm;
+}
+
+ShaderEnum ToonBsdfNode::component_enum = toon_component_init();
+
+ToonBsdfNode::ToonBsdfNode()
+{
+	component = ustring("Diffuse");
+
+	add_input("Size", SHADER_SOCKET_FLOAT, 0.5f);
+	add_input("Smooth", SHADER_SOCKET_FLOAT, 0.0f);
+}
+
+void ToonBsdfNode::compile(SVMCompiler& compiler)
+{
+	closure = (ClosureType)component_enum[component];
+	
+	BsdfNode::compile(compiler, input("Size"), input("Smooth"));
+}
+
+void ToonBsdfNode::compile(OSLCompiler& compiler)
+{
+	compiler.parameter("component", component);
+	compiler.add(this, "node_toon_bsdf");
+}
+
 /* Velvet BSDF Closure */
 
 VelvetBsdfNode::VelvetBsdfNode()