diff options
| -rw-r--r-- | source/blender/gpu/intern/gpu_node_graph.c | 2 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_vertex_color.cc | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_node_graph.c b/source/blender/gpu/intern/gpu_node_graph.c index b3a091ffbb0..91fb0544cf6 100644 --- a/source/blender/gpu/intern/gpu_node_graph.c +++ b/source/blender/gpu/intern/gpu_node_graph.c @@ -333,6 +333,8 @@ static char attr_prefix_get(CustomDataType type) switch (type) { case CD_TANGENT: return 't'; + case CD_MCOL: + return 'c'; case CD_AUTO_FROM_NAME: return 'a'; case CD_HAIRLENGTH: 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 a2a9aa9ad91..cba944c671c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc @@ -42,10 +42,20 @@ static int node_shader_gpu_vertex_color(GPUMaterial *mat, GPUNodeStack *out) { NodeShaderVertexColor *vertexColor = (NodeShaderVertexColor *)node->storage; - /* NOTE: using CD_AUTO_FROM_NAME instead of CD_MCOL or CD_PROP_COLOR as geometry nodes may - * overwrite data which will also change the CustomDataType. This will also make EEVEE and Cycles + /* 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 CustomDataType. + * This will also make EEVEE and Cycles * consistent. See T93179. */ - GPUNodeLink *vertexColorLink = GPU_attribute(mat, CD_AUTO_FROM_NAME, vertexColor->layer_name); + + GPUNodeLink *vertexColorLink; + + if (vertexColor->layer_name[0]) { + 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); + } + return GPU_stack_link(mat, node, "node_vertex_color", in, out, vertexColorLink); } |