1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_attribute.cc b/source/blender/nodes/shader/nodes/node_shader_attribute.cc
index 77cf6b163d0..4694599f064 100644
--- a/source/blender/nodes/shader/nodes/node_shader_attribute.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_attribute.cc
@@ -42,6 +42,16 @@ static int node_shader_gpu_attribute(GPUMaterial *mat,
 
   if (is_varying) {
     cd_attr = GPU_attribute(mat, CD_AUTO_FROM_NAME, attr->name);
+
+    if (STREQ(attr->name, "color")) {
+      GPU_link(mat, "node_attribute_color", cd_attr, &cd_attr);
+    }
+    else if (STREQ(attr->name, "temperature")) {
+      GPU_link(mat, "node_attribute_temperature", cd_attr, &cd_attr);
+    }
+  }
+  else if (attr->type == SHD_ATTRIBUTE_VIEW_LAYER) {
+    cd_attr = GPU_layer_attribute(mat, attr->name);
   }
   else {
     cd_attr = GPU_uniform_attribute(mat,
@@ -52,13 +62,6 @@ static int node_shader_gpu_attribute(GPUMaterial *mat,
     GPU_link(mat, "node_attribute_uniform", cd_attr, GPU_constant(&attr_hash), &cd_attr);
   }
 
-  if (STREQ(attr->name, "color")) {
-    GPU_link(mat, "node_attribute_color", cd_attr, &cd_attr);
-  }
-  else if (STREQ(attr->name, "temperature")) {
-    GPU_link(mat, "node_attribute_temperature", cd_attr, &cd_attr);
-  }
-
   GPU_stack_link(mat, node, "node_attribute", in, out, cd_attr);
 
   if (is_varying) {