* Implemented the basic stroke rendering functionality for the new

Parameter Editor mode.  This is a WIP commit.  Only the base line
color, base alpha transparency, and base line thickness are respected.
More additions are anticipated to account for other parameters.

* Added FRS_finish_stroke_rendering() to clean Freestyle-related
temporary resources after stroke rendering.

* Some functions in FRS_freestyle.cpp are now declared as static
functions, so as not to mess up the program-wide name space.

* Made the StyleModule class inheritable, and defined new subclass
BlenderStyleModule that takes a Text object instead of a file name.

2 files changed, 8 insertions, 0 deletions

diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index 5cf1b40a344..7835bb832b6 100755
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -58,6 +58,7 @@
 
 #include "../blender_interface/BlenderFileLoader.h"
 #include "../blender_interface/BlenderStrokeRenderer.h"
+#include "../blender_interface/BlenderStyleModule.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -717,6 +718,12 @@ void Controller::InsertStyleModule(unsigned index, const char *iFileName)
   
 }
 
+void Controller::InsertStyleModule(unsigned index, const char *iName, struct Text *iText)
+{
+	StyleModule* sm = new BlenderStyleModule(iText, iName, _inter);
+  _Canvas->InsertStyleModule(index, sm);
+}
+
 void Controller::AddStyleModule(const char *iFileName)
 {
   //_pStyleWindow->Add(iFileName);
diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h
index 367b57bf6c3..dfff7d7079c 100755
--- a/source/blender/freestyle/intern/application/Controller.h
+++ b/source/blender/freestyle/intern/application/Controller.h
@@ -89,6 +89,7 @@ public:
   Render* RenderStrokes(Render *re);
   void SwapStyleModules(unsigned i1, unsigned i2);
   void InsertStyleModule(unsigned index, const char *iFileName);
+  void InsertStyleModule(unsigned index, const char *iName, struct Text *iText);
   void AddStyleModule(const char *iFileName);
   void RemoveStyleModule(unsigned index);
   void ReloadStyleModule(unsigned index, const char * iFileName);