Improved context handling. Previously FRS_initialize() was used for both

initializing Freestyle and specifying contexts, making the API a bit messy.
Now FRS_initialize() is only for initialization, and contexts are specified
by new FRS_set_context() function just before starting rendering.

2 files changed, 11 insertions, 3 deletions

diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index 6b7f095c6ac..46f45f139fe 100755
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -71,7 +71,7 @@ extern "C" {
 
 
 
-Controller::Controller(bContext* C)
+Controller::Controller()
 {
 	
   const string sep(Config::DIR_SEP.c_str());
@@ -108,7 +108,7 @@ Controller::Controller(bContext* C)
 
   _Canvas = new AppCanvas;
 
-  _inter = new PythonInterpreter(C);
+  _inter = new PythonInterpreter();
   _EnableQI = true;
   _ComputeRidges = true;
   _ComputeSteerableViewMap = false;
@@ -175,6 +175,13 @@ void Controller::setView(AppView *iView)
   _Canvas->setViewer(_pView);
 }
 
+void Controller::setContext(bContext *C)
+{
+  PythonInterpreter* py_inter = dynamic_cast<PythonInterpreter*>(_inter);
+  assert(py_inter != 0);
+  py_inter->setContext(C);
+}
+
 int Controller::LoadMesh(Render *re, SceneRenderLayer* srl)
 {
   
diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h
index 99d85434811..4734462b7a5 100755
--- a/source/blender/freestyle/intern/application/Controller.h
+++ b/source/blender/freestyle/intern/application/Controller.h
@@ -66,10 +66,11 @@ extern "C" {
 class Controller
 {
 public:
-  Controller(bContext* C) ;
+  Controller() ;
   ~Controller() ;
   
   void setView(AppView *iView);
+  void setContext(bContext *C);
 
   //soc
 	void init_options();