diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-01 05:18:25 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-12 05:10:55 +0400 |
commit | b65a0228920df21b7f5a0a057bc9ad5fad64e4b3 (patch) | |
tree | cf4e3b88c1c5bf509144d24a299528837a8049df /source/blender/freestyle/intern/application | |
parent | b941ab972d1e6d7e55eaa5ad509b50a25f8100ce (diff) |
Freestyle: Removed the stored bContext from the Controller class.
The stored context object was used for creation of shade nodes. A closer look at the
node system showed that the context is not actually used when shader nodes are
added to a shader node tree. Relying on this fact, now a NULL pointer is passed to
nodeAddStaticNode() instead of the stored bContext pointer.
Diffstat (limited to 'source/blender/freestyle/intern/application')
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.cpp | 3 | ||||
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index 8f57bbefa54..176199600ac 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -210,7 +210,6 @@ void Controller::setContext(bContext *C) { PythonInterpreter *py_inter = dynamic_cast<PythonInterpreter*>(_inter); py_inter->setContext(C); - _context = C; } int Controller::LoadMesh(Render *re, SceneRenderLayer *srl) @@ -851,7 +850,7 @@ void Controller::ResetRenderCount() Render *Controller::RenderStrokes(Render *re, bool render) { _Chrono.start(); - BlenderStrokeRenderer *blenderRenderer = new BlenderStrokeRenderer(_context, re, ++_render_count); + BlenderStrokeRenderer *blenderRenderer = new BlenderStrokeRenderer(re, ++_render_count); if (render) _Canvas->Render(blenderRenderer); real d = _Chrono.stop(); diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index a653f4a63f5..f5e50347d0f 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -217,7 +217,6 @@ private: real _EPSILON; real _bboxDiag; - bContext *_context; int _render_count; //AppStyleWindow *_pStyleWindow; |