diff options
author | Jeroen Bakker <jeroen@blender.org> | 2022-05-11 15:03:44 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-05-11 15:03:44 +0300 |
commit | fbf92f5967980691a94633fa4b7e14311adf1d16 (patch) | |
tree | 51ca9f23d44c83012dca7acc20ef05ce3b9eee95 /source/blender/draw | |
parent | eef98e66cf9e726ae262a7bb7f734d01b9577812 (diff) | |
parent | b9d02b9cede338117179897fdcc2d3b1f7499cb3 (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 07d740d89c1..7dc0244275d 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -708,12 +708,18 @@ static DRW_MeshCDMask mesh_cd_calc_used_gpu_layers(const Object *object, case CD_MCOL: case CD_PROP_BYTE_COLOR: case CD_PROP_COLOR: { + /* First check Color attributes, when not found check mesh attributes. Geometry nodes + * can generate those layers. */ int vcol_bit = mesh_cd_calc_gpu_layers_vcol_used(&me_query, cd_vdata, cd_ldata, name); if (vcol_bit != -1) { cd_used.vcol |= 1UL << (uint)vcol_bit; + break; } + if (layer != -1 && domain != ATTR_DOMAIN_NUM) { + drw_mesh_attributes_add_request(attributes, type, layer, domain); + } break; } case CD_PROP_FLOAT3: |