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, 1 insertions, 15 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h b/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
index cc92d2274d8..21776396ebc 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
@@ -31,7 +31,6 @@
 extern "C" {
 #include "BLI_utildefines.h" // BLI_assert()
 
-struct FreestyleLineStyle;
 struct Scene;
 struct Text;
 }
@@ -41,26 +40,15 @@ namespace Freestyle {
 class BlenderStyleModule : public StyleModule
 {
 public:
-	BlenderStyleModule(const string &name, Interpreter *inter, struct Text *text,
-	                   struct FreestyleLineStyle *lineStyle, bool useShadingNodes)
-	: StyleModule(name, inter)
+	BlenderStyleModule(struct Text *text, const string &name, Interpreter *inter) : StyleModule(name, inter)
 	{
 		_text = text;
-		_lineStyle = lineStyle;
-		_useShadingNodes = useShadingNodes;
 	}
 
 	virtual ~BlenderStyleModule()
 	{
 	}
 
-	virtual StrokeLayer *execute()
-	{
-		StrokeLayer *sl = StyleModule::execute();
-		sl->setLineStyle(_lineStyle, _useShadingNodes);
-		return sl;
-	}
-
 protected:
 	virtual int interpret()
 	{
@@ -71,8 +59,6 @@ protected:
 
 private:
 	struct Text *_text;
-	struct FreestyleLineStyle *_lineStyle;
-	bool _useShadingNodes;
 
 #ifdef WITH_CXX_GUARDEDALLOC
 	MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderStyleModule")