diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-04-20 17:10:10 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-04-20 17:10:10 +0300 |
| commit | 03ec505fa549840936d7425269073dc82fd29b10 (patch) | |
| tree | 63d94605acd1248689852735ae07056c08505cd7 /source/blender/makesdna | |
| parent | 0385e2f1f90ff10c75773cc22125292a82cddaa6 (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/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 8 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 858de733558..ef937fb139b 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -113,7 +113,7 @@ typedef enum CustomDataType { CD_MTEXPOLY = 15, /* deprecated */ #endif CD_MLOOPUV = 16, - CD_MLOOPCOL = 17, + CD_PROP_BYTE_COLOR = 17, CD_TANGENT = 18, CD_MDISPS = 19, CD_PREVIEW_MCOL = 20, /* for displaying weightpaint colors */ @@ -181,7 +181,7 @@ typedef enum CustomDataType { #define CD_MASK_ORCO (1 << CD_ORCO) // #define CD_MASK_MTEXPOLY (1 << CD_MTEXPOLY) /* DEPRECATED */ #define CD_MASK_MLOOPUV (1 << CD_MLOOPUV) -#define CD_MASK_MLOOPCOL (1 << CD_MLOOPCOL) +#define CD_MASK_PROP_BYTE_COLOR (1 << CD_PROP_BYTE_COLOR) #define CD_MASK_TANGENT (1 << CD_TANGENT) #define CD_MASK_MDISPS (1 << CD_MDISPS) #define CD_MASK_PREVIEW_MCOL (1 << CD_PREVIEW_MCOL) @@ -224,11 +224,11 @@ typedef enum CustomDataType { /* All generic attributes. */ #define CD_MASK_PROP_ALL \ (CD_MASK_PROP_FLOAT | CD_MASK_PROP_FLOAT2 | CD_MASK_PROP_FLOAT3 | CD_MASK_PROP_INT32 | \ - CD_MASK_PROP_COLOR | CD_MASK_PROP_STRING | CD_MASK_MLOOPCOL | CD_MASK_PROP_BOOL | \ + CD_MASK_PROP_COLOR | CD_MASK_PROP_STRING | CD_MASK_PROP_BYTE_COLOR | CD_MASK_PROP_BOOL | \ CD_MASK_PROP_INT8) /* All color attributes */ -#define CD_MASK_COLOR_ALL (CD_MASK_PROP_COLOR | CD_MASK_MLOOPCOL) +#define CD_MASK_COLOR_ALL (CD_MASK_PROP_COLOR | CD_MASK_PROP_BYTE_COLOR) typedef struct CustomData_MeshMasks { uint64_t vmask; diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 2b4858d4106..cd4676ee08e 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -221,7 +221,7 @@ typedef struct Mesh { /** * The active vertex corner color layer, if it exists. Also called "Vertex Color" in Blender's * UI, even though it is stored per face corner. - * \note This pointer is for convenient access to the #CD_MLOOPCOL layer in #ldata. + * \note This pointer is for convenient access to the #CD_PROP_BYTE_COLOR layer in #ldata. */ struct MLoopCol *mloopcol; |