1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
index 2286db81860..4b52c0469aa 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
@@ -65,12 +65,12 @@ void RenderLayersNode::testRenderLink(NodeConverter &converter,
 		missingRenderLink(converter);
 		return;
 	}
-	SceneRenderLayer *srl = (SceneRenderLayer *)BLI_findlink(&scene->r.layers, layerId);
-	if (srl == NULL) {
+	ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&scene->view_layers, layerId);
+	if (view_layer == NULL) {
 		missingRenderLink(converter);
 		return;
 	}
-	RenderLayer *rl = RE_GetRenderLayer(rr, srl->name);
+	RenderLayer *rl = RE_GetRenderLayer(rr, view_layer->name);
 	if (rl == NULL) {
 		missingRenderLink(converter);
 		return;
@@ -157,6 +157,11 @@ void RenderLayersNode::missingSocketLink(NodeConverter &converter,
 			operation = value_operation;
 			break;
 		}
+		default:
+		{
+			BLI_assert("!Unexpected data type");
+			return;
+		}
 	}
 
 	converter.mapOutputSocket(output, operation->getOutputSocket());