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/gpu | |
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/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_node_graph.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 110fdfbd2d9..fed998bb33e 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -207,7 +207,7 @@ void GPU_pbvh_mesh_buffers_update(GPU_PBVH_Buffers *buffers, int update_flags) { const MPropCol *vtcol = vcol_type == CD_PROP_COLOR ? vcol_data : NULL; - const MLoopCol *vcol = vcol_type == CD_MLOOPCOL ? vcol_data : NULL; + const MLoopCol *vcol = vcol_type == CD_PROP_BYTE_COLOR ? vcol_data : NULL; const float(*f3col)[3] = vcol_type == CD_PROP_FLOAT3 ? vcol_data : NULL; const bool color_loops = vcol_domain == ATTR_DOMAIN_CORNER; diff --git a/source/blender/gpu/intern/gpu_node_graph.c b/source/blender/gpu/intern/gpu_node_graph.c index 20551785535..7f96a3b01c4 100644 --- a/source/blender/gpu/intern/gpu_node_graph.c +++ b/source/blender/gpu/intern/gpu_node_graph.c @@ -336,7 +336,7 @@ static char attr_prefix_get(CustomDataType type) case CD_TANGENT: return 't'; case CD_MCOL: - case CD_MLOOPCOL: + case CD_PROP_BYTE_COLOR: return 'c'; case CD_PROP_COLOR: return 'c'; |