Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-07-19 13:52:32 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-08-12 05:10:36 +0400
commit34c133a488bdd78a1bd5027e1dcc8c60da86d25a (patch)
tree6cc5822b6a0fc79b9d8ae0fdb75a3cebf6fa6080 /source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
parentc38e80d6322b942fd2a893f4f294a919ed6e6b99 (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/blender_interface/BlenderStrokeRenderer.h')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
index 5150111e128..609909a8b26 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
@@ -30,11 +30,12 @@
extern "C" {
struct Main;
+struct Material;
struct Object;
struct Render;
struct Scene;
struct bContext;
-struct FreestyleLineStyle;
+struct bNodeTree;
}
namespace Freestyle {
@@ -53,7 +54,7 @@ public:
Render *RenderScene(Render *re, bool render);
- static Material* GetStrokeShader(bContext *C, Main *bmain, FreestyleLineStyle *linestyle);
+ static Material* GetStrokeShader(bContext *C, Main *bmain, bNodeTree *iNodeTree);
protected:
Main *freestyle_bmain;