blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: rename face_corners to loop for internal layer operations 

Follows naming used elsewhere.
This commit is contained in:
Campbell Barton 2023-01-11 13:53:22 +11:00
parent bd7a1d5de6
commit 28d38e876f
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/BKE_mesh_legacy_convert.h
View File

@ -26,9 +26,10 @@ struct MFace;
#ifdef __cplusplus
void BKE_mesh_legacy_convert_uvs_to_struct(Mesh *mesh,
blender::ResourceScope &temp_mloopuv_for_convert,
blender::Vector<CustomDataLayer, 16> &layers_to_write);
void BKE_mesh_legacy_convert_uvs_to_struct(
Mesh *mesh,
blender::ResourceScope &temp_mloopuv_for_convert,
blender::Vector<CustomDataLayer, 16> &loop_layers_to_write);
void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh);
/**

8
source/blender/blenkernel/intern/mesh_legacy_convert.cc
View File

@ -1519,7 +1519,7 @@ void BKE_mesh_legacy_convert_mpoly_to_material_indices(Mesh *mesh)
void BKE_mesh_legacy_convert_uvs_to_struct(
Mesh *mesh,
blender::ResourceScope &temp_mloopuv_for_convert,
blender::Vector<CustomDataLayer, 16> &face_corner_layers_to_write)
blender::Vector<CustomDataLayer, 16> &loop_layers_to_write)
{
using namespace blender;
using namespace blender::bke;
@ -1531,13 +1531,13 @@ void BKE_mesh_legacy_convert_uvs_to_struct(
char vert_name[MAX_CUSTOMDATA_LAYER_NAME];
char edge_name[MAX_CUSTOMDATA_LAYER_NAME];
char pin_name[MAX_CUSTOMDATA_LAYER_NAME];
for (const CustomDataLayer &layer : face_corner_layers_to_write) {
for (const CustomDataLayer &layer : loop_layers_to_write) {
uv_sublayers_to_skip.add_multiple_new({BKE_uv_map_vert_select_name_get(layer.name, vert_name),
BKE_uv_map_edge_select_name_get(layer.name, edge_name),
BKE_uv_map_pin_name_get(layer.name, pin_name)});
}
for (const CustomDataLayer &layer : face_corner_layers_to_write) {
for (const CustomDataLayer &layer : loop_layers_to_write) {
if (uv_sublayers_to_skip.contains_as(layer.name)) {
continue;
}
@ -1571,7 +1571,7 @@ void BKE_mesh_legacy_convert_uvs_to_struct(
new_layer_to_write.append(mloopuv_layer);
}
face_corner_layers_to_write = new_layer_to_write;
loop_layers_to_write = new_layer_to_write;
mesh->ldata.totlayer = new_layer_to_write.size();
mesh->ldata.maxlayer = mesh->ldata.totlayer;
}