From 03ec505fa549840936d7425269073dc82fd29b10 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 20 Apr 2022 09:10:10 -0500 Subject: Cleanup: Rename CD_MLOOPCOL to CD_PROP_BYTE_COLOR The "PROP" in the name reflects its generic status, and removing "LOOP" makes sense because it is no longer associated with just mesh face corners. In general the goal is to remove extra semantic meaning from the custom data types. --- source/blender/render/intern/texture_pointdensity.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/texture_pointdensity.c b/source/blender/render/intern/texture_pointdensity.c index bb313d4962c..8ba3bac7cad 100644 --- a/source/blender/render/intern/texture_pointdensity.c +++ b/source/blender/render/intern/texture_pointdensity.c @@ -277,11 +277,12 @@ static void pointdensity_cache_vertex_color(PointDensity *pd, BLI_assert(data_color); - if (!CustomData_has_layer(&mesh->ldata, CD_MLOOPCOL)) { + if (!CustomData_has_layer(&mesh->ldata, CD_PROP_BYTE_COLOR)) { return; } - CustomData_validate_layer_name(&mesh->ldata, CD_MLOOPCOL, pd->vertex_attribute_name, layername); - mcol = CustomData_get_layer_named(&mesh->ldata, CD_MLOOPCOL, layername); + CustomData_validate_layer_name( + &mesh->ldata, CD_PROP_BYTE_COLOR, pd->vertex_attribute_name, layername); + mcol = CustomData_get_layer_named(&mesh->ldata, CD_PROP_BYTE_COLOR, layername); if (!mcol) { return; } @@ -372,7 +373,7 @@ static void pointdensity_cache_object(PointDensity *pd, Object *ob) mask.fmask |= CD_MASK_MTFACE | CD_MASK_MCOL; switch (pd->ob_color_source) { case TEX_PD_COLOR_VERTCOL: - mask.lmask |= CD_MASK_MLOOPCOL; + mask.lmask |= CD_MASK_PROP_BYTE_COLOR; break; case TEX_PD_COLOR_VERTWEIGHT: mask.vmask |= CD_MASK_MDEFORMVERT; -- cgit v1.2.3