1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 160f999f4e7..68077d4d93b 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -107,7 +107,7 @@ void RE_engines_exit(void)
 	DRW_engines_free();
 
 	BKE_layer_collection_engine_settings_callback_free();
-	BKE_scene_layer_engine_settings_callback_free();
+	BKE_view_layer_engine_settings_callback_free();
 
 	for (type = R_engines.first; type; type = next) {
 		next = type->next;
@@ -133,7 +133,7 @@ void RE_engines_register(Main *bmain, RenderEngineType *render_type)
 		            bmain, render_type->idname, render_type->collection_settings_create);
 	}
 	if (render_type->render_settings_create) {
-		BKE_scene_layer_engine_settings_callback_register(
+		BKE_view_layer_engine_settings_callback_register(
 		            bmain, render_type->idname, render_type->render_settings_create);
 	}
 	BLI_addtail(&R_engines, render_type);
@@ -658,7 +658,7 @@ int RE_engine_render(Render *re, int do_all)
 	 * creating the render result */
 	if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_BUTS_PREVIEW)) == 0) {
 		BKE_scene_graph_update_for_newframe(re->eval_ctx, re->depsgraph, re->main, re->scene, NULL);
-		render_update_anim_renderdata(re, &re->scene->r, &re->scene->render_layers);
+		render_update_anim_renderdata(re, &re->scene->r, &re->scene->view_layers);
 	}
 
 	/* create render result */
@@ -777,12 +777,12 @@ int RE_engine_render(Render *re, int do_all)
 	return 1;
 }
 
-void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct SceneLayer *scene_layer,
+void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer,
                              const char *name, int UNUSED(channels), const char *UNUSED(chanid), int type)
 {
 	/* The channel information is currently not used, but is part of the API in case it's needed in the future. */
 
-	if (!(scene && scene_layer && engine)) {
+	if (!(scene && view_layer && engine)) {
 		return;
 	}
 
@@ -792,12 +792,12 @@ void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, s
 	Scene *sce;
 	for (sce = G.main->scene.first; sce; sce = sce->id.next) {
 		if (sce->nodetree) {
-			ntreeCompositRegisterPass(sce->nodetree, scene, scene_layer, name, type);
+			ntreeCompositRegisterPass(sce->nodetree, scene, view_layer, name, type);
 		}
 	}
 }
 
-SceneLayer *RE_engine_get_scene_layer(Render *re)
+ViewLayer *RE_engine_get_view_layer(Render *re)
 {
-	return re->eval_ctx->scene_layer;
+	return re->eval_ctx->view_layer;
 }