diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-19 13:52:32 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-12 05:10:36 +0400 |
commit | 34c133a488bdd78a1bd5027e1dcc8c60da86d25a (patch) | |
tree | 6cc5822b6a0fc79b9d8ae0fdb75a3cebf6fa6080 /source/blender/freestyle/intern/stroke/StrokeRep.h | |
parent | c38e80d6322b942fd2a893f4f294a919ed6e6b99 (diff) |
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.
Diffstat (limited to 'source/blender/freestyle/intern/stroke/StrokeRep.h')
-rw-r--r-- | source/blender/freestyle/intern/stroke/StrokeRep.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h index a62fa4bdb9e..ba042eb496d 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.h +++ b/source/blender/freestyle/intern/stroke/StrokeRep.h @@ -38,7 +38,7 @@ extern "C" { #include "DNA_material_types.h" // for MAX_MTEX -struct FreestyleLineStyle; +struct bNodeTree; } namespace Freestyle { @@ -186,9 +186,8 @@ protected: unsigned int _textureId; float _textureStep; MTex *_mtex[MAX_MTEX]; + bNodeTree *_nodeTree; Material *_material; - FreestyleLineStyle *_lineStyle; - bool _useShadingNodes; bool _hasTex; // float _averageTextureAlpha; @@ -226,14 +225,9 @@ public: return _material; } - inline FreestyleLineStyle *getLineStyle() const + inline bNodeTree *getNodeTree() const { - return _lineStyle; - } - - inline bool useShadingNodes() const - { - return _useShadingNodes; + return _nodeTree; } inline bool hasTex() const |