diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-04-20 17:10:10 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-04-21 12:09:06 +0300 |
| commit | eef047c14e432d54f17737d75ccc96d3e8f6a3e9 (patch) | |
| tree | 5bff0707b01bd8b29196e2bcc52f219fbbdc138c /source/blender/draw/engines/workbench/workbench_engine.c | |
| parent | a2c8b9950bd8cc0976b17b6e9ce50102f62ccd99 (diff) | |
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.
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_engine.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_engine.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index ccd693bc4c2..60919d0d028 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -289,9 +289,9 @@ static eV3DShadingColorType workbench_color_type_get(WORKBENCH_PrivateData *wpd, const CustomData *cd_ldata = workbench_mesh_get_loop_custom_data(me); bool has_color = (CustomData_has_layer(cd_vdata, CD_PROP_COLOR) || - CustomData_has_layer(cd_vdata, CD_MLOOPCOL) || + CustomData_has_layer(cd_vdata, CD_PROP_BYTE_COLOR) || CustomData_has_layer(cd_ldata, CD_PROP_COLOR) || - CustomData_has_layer(cd_ldata, CD_MLOOPCOL)); + CustomData_has_layer(cd_ldata, CD_PROP_BYTE_COLOR)); if (!has_color) { color_type = V3D_SHADING_OBJECT_COLOR; @@ -314,7 +314,7 @@ static eV3DShadingColorType workbench_color_type_get(WORKBENCH_PrivateData *wpd, *r_texpaint_mode = true; } } - else if (is_vertpaint_mode && me && CustomData_has_layer(ldata, CD_MLOOPCOL)) { + else if (is_vertpaint_mode && me && CustomData_has_layer(ldata, CD_PROP_BYTE_COLOR)) { color_type = V3D_SHADING_VERTEX_COLOR; } } |