Merge branch 'master' into blender2.8
[blender.git] / source / blender / freestyle / intern / application / Controller.cpp
index e84d854..200e3eb 100644 (file)
@@ -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);