griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T92750: sculpt vertex colors missing in object mode

Browse Source 
The layers were not aliased properly for usage in the shaders.

Regression caused by rB03013d19d167.
This commit is contained in:
Kévin Dietrich
2021-11-15 02:38:52 +01:00
parent 0a6f428be7
commit 622e6f05f1
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc
View File

@@ -172,6 +172,18 @@ static void init_vbo_for_attribute(const MeshRenderData *mr,
GPUVertFormat format = {0};
GPU_vertformat_deinterleave(&format);
GPU_vertformat_attr_add(&format, attr_name, comp_type, comp_size, fetch_mode);
/* Ensure Sculpt Vertex Colors are properly aliased. */
if (request.cd_type == CD_PROP_COLOR && request.domain == ATTR_DOMAIN_POINT) {
CustomData *cd_vdata = get_custom_data_for_domain(mr, ATTR_DOMAIN_POINT);
if (request.layer_index == CustomData_get_render_layer(cd_vdata, CD_PROP_COLOR)) {
GPU_vertformat_alias_add(&format, "c");
}
if (request.layer_index == CustomData_get_active_layer(cd_vdata, CD_PROP_COLOR)) {
GPU_vertformat_alias_add(&format, "ac");
}
}
GPU_vertbuf_init_with_format(vbo, &format);
GPU_vertbuf_data_alloc(vbo, static_cast<uint32_t>(mr->loop_len));
}