Freestyle: an improved workflow of line style shading nodes.

Removed the previous changes for passing a line style through the Controller, and
revised the BlenderTextureShader to assign the shader node tree of a line style
(if specified) to strokes.  This way the assignment of shading nodes can be done
through both the Freestyle GUI and Python scripting.

1 files changed, 15 insertions, 0 deletions

diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
index 9186d164e9b..6ac22c5b2d1 100644
--- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
@@ -36,7 +36,10 @@
 #include "../geometry/Bezier.h"
 #include "../geometry/Geom.h"
 
+extern "C" {
 struct MTex;
+struct bNodeTree;
+}
 
 using namespace std;
 
@@ -904,6 +907,7 @@ class BlenderTextureShader : public StrokeShader
 {
 private:
 	MTex *_mtex;
+	bNodeTree *_nodeTree;
 
 public:
 	/*! Builds the shader.
@@ -913,6 +917,17 @@ public:
 	BlenderTextureShader(MTex *mtex) : StrokeShader()
 	{
 		_mtex = mtex;
+		_nodeTree = NULL;
+	}
+
+	/*! Builds the shader.
+	*  \param nodetree
+	*    A node tree (of new shading nodes) to define textures.
+	*/
+	BlenderTextureShader(bNodeTree *nodetree) : StrokeShader()
+	{
+		_nodeTree = nodetree;
+		_mtex = NULL;
 	}
 
 	virtual string getName() const