From f75d87bd765fa8d961311eccf979c30665c3d037 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Fri, 27 Jun 2014 00:40:41 +0900 Subject: Initial implementation of Cycles materials for Freestyle stroke rendering. --- source/blender/freestyle/intern/application/Controller.cpp | 3 ++- source/blender/freestyle/intern/application/Controller.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/freestyle/intern/application') diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index 176199600ac..8f57bbefa54 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -210,6 +210,7 @@ void Controller::setContext(bContext *C) { PythonInterpreter *py_inter = dynamic_cast(_inter); py_inter->setContext(C); + _context = C; } int Controller::LoadMesh(Render *re, SceneRenderLayer *srl) @@ -850,7 +851,7 @@ void Controller::ResetRenderCount() Render *Controller::RenderStrokes(Render *re, bool render) { _Chrono.start(); - BlenderStrokeRenderer *blenderRenderer = new BlenderStrokeRenderer(re, ++_render_count); + BlenderStrokeRenderer *blenderRenderer = new BlenderStrokeRenderer(_context, 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 f5e50347d0f..a653f4a63f5 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -217,6 +217,7 @@ private: real _EPSILON; real _bboxDiag; + bContext *_context; int _render_count; //AppStyleWindow *_pStyleWindow; -- cgit v1.2.3