diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-19 10:38:56 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-12 05:10:35 +0400 |
commit | c38e80d6322b942fd2a893f4f294a919ed6e6b99 (patch) | |
tree | 67470e7670d5975085a5a211a3c5aab9cef4aa51 /source/blender/freestyle/intern/application | |
parent | a2a2d4679ae28dbc9f6bed1c8663cea9ccb71176 (diff) |
WIP commit just for a record of a working snapshot of code revisions for node-based textured strokes.
Diffstat (limited to 'source/blender/freestyle/intern/application')
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.cpp | 6 | ||||
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index e4bfdb27381..4fd58ab7af2 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -892,10 +892,10 @@ void Controller::InsertStyleModule(unsigned index, const char *iFileName) _Canvas->InsertStyleModule(index, sm); } -void Controller::InsertStyleModule(unsigned index, const char *iName, struct FreestyleLineStyle *iLineStyle, - struct Text *iText) +void Controller::InsertStyleModule(unsigned index, const char *iName, struct Text *iText, + struct FreestyleLineStyle *iLineStyle, bool iUseShadingNodes) { - StyleModule *sm = new BlenderStyleModule(iText, iLineStyle, iName, _inter); + StyleModule *sm = new BlenderStyleModule(iName, _inter, iText, iLineStyle, iUseShadingNodes); _Canvas->InsertStyleModule(index, sm); } diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index d2b865de42a..c4f2596d7a9 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -89,8 +89,8 @@ public: Render *RenderStrokes(Render *re, bool render); void SwapStyleModules(unsigned i1, unsigned i2); void InsertStyleModule(unsigned index, const char *iFileName); - void InsertStyleModule(unsigned index, const char *iName, struct FreestyleLineStyle *iLineStyle, - struct Text *iText); + void InsertStyleModule(unsigned index, const char *iName, struct Text *iText, + struct FreestyleLineStyle *iLineStyle, bool iUseShadingNodes); void AddStyleModule(const char *iFileName); void RemoveStyleModule(unsigned index); void ReloadStyleModule(unsigned index, const char * iFileName); |