[Bf-blender-cvs] [5755d648ae6] refactor-mesh-uv-map-generic: Rename selection and pin name getters
Hans Goudey
noreply at git.blender.org
Mon Jan 2 00:37:31 CET 2023
Commit: 5755d648ae6f3529e41c6c83c2fb3ef571b78883
Author: Hans Goudey
Date: Sun Jan 1 17:40:00 2023 -0500
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB5755d648ae6f3529e41c6c83c2fb3ef571b78883
Rename selection and pin name getters
===================================================================
M source/blender/blenkernel/BKE_attribute.h
M source/blender/blenkernel/intern/attribute.cc
M source/blender/blenkernel/intern/mesh_legacy_convert.cc
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/intern/bmesh_mesh_convert.cc
M source/blender/bmesh/intern/bmesh_query_uv.cc
M source/blender/editors/mesh/mesh_data.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_attribute.h b/source/blender/blenkernel/BKE_attribute.h
index be7e98b9f4e..918a0573e72 100644
--- a/source/blender/blenkernel/BKE_attribute.h
+++ b/source/blender/blenkernel/BKE_attribute.h
@@ -134,9 +134,9 @@ struct CustomDataLayer *BKE_id_attributes_color_find(const struct ID *id, const
bool BKE_id_attribute_calc_unique_name(struct ID *id, const char *name, char *outname);
-char const *BKE_get_uv_map_vert_selection_name(char const *uv_map_name, char *buffer);
-char const *BKE_get_uv_map_edge_selection_name(char const *uv_map_name, char *buffer);
-char const *BKE_get_uv_map_pin_name(char const *uv_map_name, char *buffer);
+char const *BKE_uv_map_vert_selection_name_get(char const *uv_map_name, char *buffer);
+char const *BKE_uv_map_edge_selection_name_get(char const *uv_map_name, char *buffer);
+char const *BKE_uv_map_pin_name_get(char const *uv_map_name, char *buffer);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc
index 869503e9a3b..4a67d2cfba3 100644
--- a/source/blender/blenkernel/intern/attribute.cc
+++ b/source/blender/blenkernel/intern/attribute.cc
@@ -173,16 +173,16 @@ bool BKE_id_attribute_rename(ID *id,
char buffer_src[MAX_CUSTOMDATA_LAYER_NAME];
char buffer_dst[MAX_CUSTOMDATA_LAYER_NAME];
BKE_id_attribute_rename(id,
- BKE_get_uv_map_vert_selection_name(layer->name, buffer_src),
- BKE_get_uv_map_vert_selection_name(result_name, buffer_dst),
+ BKE_uv_map_vert_selection_name_get(layer->name, buffer_src),
+ BKE_uv_map_vert_selection_name_get(result_name, buffer_dst),
reports);
BKE_id_attribute_rename(id,
- BKE_get_uv_map_edge_selection_name(layer->name, buffer_src),
- BKE_get_uv_map_edge_selection_name(result_name, buffer_dst),
+ BKE_uv_map_edge_selection_name_get(layer->name, buffer_src),
+ BKE_uv_map_edge_selection_name_get(result_name, buffer_dst),
reports);
BKE_id_attribute_rename(id,
- BKE_get_uv_map_pin_name(layer->name, buffer_src),
- BKE_get_uv_map_pin_name(result_name, buffer_dst),
+ BKE_uv_map_pin_name_get(layer->name, buffer_src),
+ BKE_uv_map_pin_name_get(result_name, buffer_dst),
reports);
}
if (StringRef(old_name) == BKE_id_attributes_active_color_name(id)) {
@@ -799,7 +799,7 @@ void BKE_id_attribute_copy_domains_temp(short id_type,
*((short *)r_id->name) = id_type;
}
-char const *BKE_get_uv_map_vert_selection_name(char const *uv_map_name, char *buffer)
+char const *BKE_uv_map_vert_selection_name_get(char const *uv_map_name, char *buffer)
{
BLI_assert(strlen(UV_VERTSEL_NAME) == 2);
BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 5);
@@ -807,7 +807,7 @@ char const *BKE_get_uv_map_vert_selection_name(char const *uv_map_name, char *bu
return buffer;
}
-char const *BKE_get_uv_map_edge_selection_name(char const *uv_map_name, char *buffer)
+char const *BKE_uv_map_edge_selection_name_get(char const *uv_map_name, char *buffer)
{
BLI_assert(strlen(UV_EDGESEL_NAME) == 2);
BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 5);
@@ -815,7 +815,7 @@ char const *BKE_get_uv_map_edge_selection_name(char const *uv_map_name, char *bu
return buffer;
}
-char const *BKE_get_uv_map_pin_name(char const *uv_map_name, char *buffer)
+char const *BKE_uv_map_pin_name_get(char const *uv_map_name, char *buffer)
{
BLI_assert(strlen(UV_PINNED_NAME) == 2);
BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 5);
diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
index aec0be50e68..913510b25ec 100644
--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@@ -1485,9 +1485,9 @@ void BKE_mesh_legacy_convert_uvs_to_struct(
char pin_name[MAX_CUSTOMDATA_LAYER_NAME];
for (const CustomDataLayer &layer : face_corner_layers_to_write) {
uv_sublayers_to_skip.add_multiple_new(
- {BKE_get_uv_map_vert_selection_name(layer.name, vert_name),
- BKE_get_uv_map_edge_selection_name(layer.name, edge_name),
- BKE_get_uv_map_pin_name(layer.name, pin_name)});
+ {BKE_uv_map_vert_selection_name_get(layer.name, vert_name),
+ BKE_uv_map_edge_selection_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) {
@@ -1507,11 +1507,11 @@ void BKE_mesh_legacy_convert_uvs_to_struct(
char buffer[MAX_CUSTOMDATA_LAYER_NAME];
const VArray<bool> vert_selection = attributes.lookup_or_default<bool>(
- BKE_get_uv_map_vert_selection_name(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
+ BKE_uv_map_vert_selection_name_get(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
const VArray<bool> edge_selection = attributes.lookup_or_default<bool>(
- BKE_get_uv_map_edge_selection_name(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
+ BKE_uv_map_edge_selection_name_get(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
const VArray<bool> pin = attributes.lookup_or_default<bool>(
- BKE_get_uv_map_pin_name(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
+ BKE_uv_map_pin_name_get(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
threading::parallel_for(mloopuv.index_range(), 2048, [&](IndexRange range) {
for (const int i : range) {
@@ -1609,7 +1609,7 @@ void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh)
CD_ASSIGN,
vert_selection,
mesh->totloop,
- BKE_get_uv_map_vert_selection_name(name.c_str(), buffer));
+ BKE_uv_map_vert_selection_name_get(name.c_str(), buffer));
}
if (edge_selection) {
CustomData_add_layer_named(&mesh->ldata,
@@ -1617,7 +1617,7 @@ void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh)
CD_ASSIGN,
edge_selection,
mesh->totloop,
- BKE_get_uv_map_edge_selection_name(name.c_str(), buffer));
+ BKE_uv_map_edge_selection_name_get(name.c_str(), buffer));
}
if (pin) {
CustomData_add_layer_named(&mesh->ldata,
@@ -1625,7 +1625,7 @@ void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh)
CD_ASSIGN,
pin,
mesh->totloop,
- BKE_get_uv_map_pin_name(name.c_str(), buffer));
+ BKE_uv_map_pin_name_get(name.c_str(), buffer));
}
}
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index 92fb0bf225a..3fb6492d3fb 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -884,19 +884,19 @@ void BM_uv_map_ensure_selection_and_pin_attributes(BMesh *bm)
bm,
&bm->ldata,
CD_PROP_BOOL,
- BKE_get_uv_map_vert_selection_name(
+ BKE_uv_map_vert_selection_name_get(
CustomData_get_layer_name(&bm->ldata, CD_PROP_FLOAT2, l), name));
BM_data_layer_ensure_named(
bm,
&bm->ldata,
CD_PROP_BOOL,
- BKE_get_uv_map_edge_selection_name(
+ BKE_uv_map_edge_selection_name_get(
CustomData_get_layer_name(&bm->ldata, CD_PROP_FLOAT2, l), name));
BM_data_layer_ensure_named(
bm,
&bm->ldata,
CD_PROP_BOOL,
- BKE_get_uv_map_pin_name(CustomData_get_layer_name(&bm->ldata, CD_PROP_FLOAT2, l), name));
+ BKE_uv_map_pin_name_get(CustomData_get_layer_name(&bm->ldata, CD_PROP_FLOAT2, l), name));
}
}
@@ -904,21 +904,21 @@ void BM_uv_map_ensure_vert_selection_attribute(BMesh *bm, const char *uv_map_nam
{
char name[MAX_CUSTOMDATA_LAYER_NAME];
BM_data_layer_ensure_named(
- bm, &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_vert_selection_name(uv_map_name, name));
+ bm, &bm->ldata, CD_PROP_BOOL, BKE_uv_map_vert_selection_name_get(uv_map_name, name));
}
void BM_uv_map_ensure_edge_selection_attribute(BMesh *bm, const char *uv_map_name)
{
char name[MAX_CUSTOMDATA_LAYER_NAME];
BM_data_layer_ensure_named(
- bm, &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_edge_selection_name(uv_map_name, name));
+ bm, &bm->ldata, CD_PROP_BOOL, BKE_uv_map_edge_selection_name_get(uv_map_name, name));
}
void BM_uv_map_ensure_pin_attribute(BMesh *bm, const char *uv_map_name)
{
char name[MAX_CUSTOMDATA_LAYER_NAME];
BM_data_layer_ensure_named(
- bm, &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_pin_name(uv_map_name, name));
+ bm, &bm->ldata, CD_PROP_BOOL, BKE_uv_map_pin_name_get(uv_map_name, name));
}
void BM_data_layer_free(BMesh *bm, CustomData *data, int type)
diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
index 8588a98f7a6..01093a95cb5 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
@@ -153,21 +153,21 @@ void BM_mesh_bm_from_me(BMesh *bm, const Mesh *me, const struct BMeshFromMeshPar
for (const int l : IndexRange(CustomData_number_of_layers(&mesh_ldata, CD_PROP_FLOAT2))) {
char name[MAX_CUSTOMDATA_LAYER_NAME];
- BKE_get_uv_map_vert_selection_name(CustomData_get_layer_name(&mesh_ldata, CD_PROP_FLOAT2, l),
+ BKE_uv_map_vert_selection_name_get(CustomData_get_layer_name(&mesh_ldata, CD_PROP_FLOAT2, l),
name);
if (CustomData_get_named_layer_index(&mes
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list