1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc
index 830f02d8df1..6e2325bddf9 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc
@@ -29,7 +29,7 @@ static void node_shader_buts_vertex_color(uiLayout *layout, bContext *C, Pointer
   }
 }
 
-static void node_shader_init_vertex_color(bNodeTree *UNUSED(ntree), bNode *node)
+static void node_shader_init_vertex_color(bNodeTree * /*ntree*/, bNode *node)
 {
   NodeShaderVertexColor *vertexColor = MEM_cnew<NodeShaderVertexColor>("NodeShaderVertexColor");
   node->storage = vertexColor;
@@ -37,14 +37,13 @@ static void node_shader_init_vertex_color(bNodeTree *UNUSED(ntree), bNode *node)
 
 static int node_shader_gpu_vertex_color(GPUMaterial *mat,
                                         bNode *node,
-                                        bNodeExecData *UNUSED(execdata),
+                                        bNodeExecData * /*execdata*/,
                                         GPUNodeStack *in,
                                         GPUNodeStack *out)
 {
   NodeShaderVertexColor *vertexColor = (NodeShaderVertexColor *)node->storage;
-  /* NOTE: using CD_AUTO_FROM_NAME instead of CD_MCOL or CD_PROP_COLOR for named attributes
-   * as geometry nodes may overwrite data which will also change the eCustomDataType.
-   * This will also make EEVEE and Cycles
+  /* NOTE: Using #CD_AUTO_FROM_NAME is necessary because there are multiple color attribute types,
+   * and the type may change during evaluation anyway. This will also make EEVEE and Cycles
    * consistent. See T93179. */
 
   GPUNodeLink *vertexColorLink;
@@ -53,7 +52,7 @@ static int node_shader_gpu_vertex_color(GPUMaterial *mat,
     vertexColorLink = GPU_attribute(mat, CD_AUTO_FROM_NAME, vertexColor->layer_name);
   }
   else { /* Fall back on active render color attribute. */
-    vertexColorLink = GPU_attribute(mat, CD_MCOL, vertexColor->layer_name);
+    vertexColorLink = GPU_attribute_default_color(mat);
   }
 
   return GPU_stack_link(mat, node, "node_vertex_color", in, out, vertexColorLink);