diff options
Diffstat (limited to 'source/blender/freestyle/intern/application')
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.cpp | 8 | ||||
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.h | 2 |
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 e84d85416dd..200e3eb3b5b 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -40,7 +40,7 @@ extern "C" { #include "../scene_graph/NodeDrawingStyle.h" #include "../scene_graph/NodeShape.h" #include "../scene_graph/NodeTransform.h" -#include "../scene_graph/NodeSceneRenderLayer.h" +#include "../scene_graph/NodeViewLayer.h" #include "../scene_graph/ScenePrettyPrinter.h" #include "../scene_graph/VertexRep.h" @@ -232,9 +232,9 @@ bool Controller::hitViewMapCache() return false; } -int Controller::LoadMesh(Render *re, SceneRenderLayer *srl) +int Controller::LoadMesh(Render *re, ViewLayer *view_layer) { - BlenderFileLoader loader(re, srl); + BlenderFileLoader loader(re, view_layer); loader.setRenderMonitor(_pRenderMonitor); @@ -301,7 +301,7 @@ int Controller::LoadMesh(Render *re, SceneRenderLayer *srl) } cam->setProjectionMatrix(proj); _RootNode->AddChild(cam); - _RootNode->AddChild(new NodeSceneRenderLayer(*re->scene, *srl)); + _RootNode->AddChild(new NodeViewLayer(*re->scene, *view_layer)); sceneHashFunc.reset(); //blenderScene->accept(sceneHashFunc); diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index 154edaf1e53..0304c18b8a6 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -68,7 +68,7 @@ public: //soc void init_options(); - int LoadMesh(Render *re, SceneRenderLayer *srl); + int LoadMesh(Render *re, ViewLayer *view_layer); int Load3DSFile(const char *iFileName); void CloseFile(); void ComputeViewMap(); |