Rename any instance of scene layer or render layer in code with view layer
[blender.git] / source / blender / freestyle / intern / application / Controller.cpp
index 9754cf1de9f7452eac10e41bb1092ddf3c1060db..759f6456759f936daae5329b49d134d2afcce261 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/NodeSceneLayer.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, SceneLayer *scene_layer)
+int Controller::LoadMesh(Render *re, ViewLayer *view_layer)
 {
-       BlenderFileLoader loader(re, scene_layer);
+       BlenderFileLoader loader(re, view_layer);
 
        loader.setRenderMonitor(_pRenderMonitor);
 
@@ -301,7 +301,7 @@ int Controller::LoadMesh(Render *re, SceneLayer *scene_layer)
                }
                cam->setProjectionMatrix(proj);
                _RootNode->AddChild(cam);
-               _RootNode->AddChild(new NodeSceneLayer(*re->scene, *scene_layer));
+               _RootNode->AddChild(new NodeViewLayer(*re->scene, *view_layer));
 
                sceneHashFunc.reset();
                //blenderScene->accept(sceneHashFunc);