[Bf-blender-cvs] [225b2577f7a] refactor-mesh-uv-map-generic: Changed some names and comments as requested in the review. No functional changes
Martijn Versteegh
noreply at git.blender.org
Mon Jan 9 13:17:12 CET 2023
Commit: 225b2577f7a5ea496b3b740b4d37a5a6dc891d4e
Author: Martijn Versteegh
Date: Mon Jan 9 13:10:14 2023 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB225b2577f7a5ea496b3b740b4d37a5a6dc891d4e
Changed some names and comments as requested in the review. No functional changes
===================================================================
M source/blender/blenkernel/BKE_attribute.h
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenkernel/intern/attribute.cc
M source/blender/blenkernel/intern/customdata.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
M source/blender/editors/object/object_bake_api.c
M source/blender/makesdna/DNA_customdata_types.h
M source/blender/makesrna/intern/rna_attribute.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_mesh_api.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_attribute.h b/source/blender/blenkernel/BKE_attribute.h
index 8fdf3850798..7c01a9205fc 100644
--- a/source/blender/blenkernel/BKE_attribute.h
+++ b/source/blender/blenkernel/BKE_attribute.h
@@ -131,8 +131,8 @@ 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);
-const char *BKE_uv_map_vert_selection_name_get(const char *uv_map_name, char *buffer);
-const char *BKE_uv_map_edge_selection_name_get(const char *uv_map_name, char *buffer);
+const char *BKE_uv_map_vert_select_name_get(const char *uv_map_name, char *buffer);
+const char *BKE_uv_map_edge_select_name_get(const char *uv_map_name, char *buffer);
const char *BKE_uv_map_pin_name_get(const char *uv_map_name, char *buffer);
#ifdef __cplusplus
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 96d5c45e297..003dca00997 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -31,6 +31,12 @@ struct CustomData_MeshMasks;
struct ID;
typedef uint64_t eCustomDataMask;
+/* These names are used as prefixes for UV layer names to find the associated bool
+ * layers. They should never be longer than 2 chars, as MAX_CUSTOMDATA_LAYER_NAME
+ * has 4 extra bytes above what can be used for the base layer name, and these
+ * prefixes uare placed between 2 '.'s at the start of the layer name.
+ * For example The uv vert selection layer of a layer named 'UVMap.001'
+ * will be called '.vs.UVMap.001' . */
#define UV_VERTSEL_NAME "vs"
#define UV_EDGESEL_NAME "es"
#define UV_PINNED_NAME "pn"
diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc
index 183f33c4c81..bb04dccd713 100644
--- a/source/blender/blenkernel/intern/attribute.cc
+++ b/source/blender/blenkernel/intern/attribute.cc
@@ -187,12 +187,12 @@ bool BKE_id_attribute_rename(ID *id,
char buffer_dst[MAX_CUSTOMDATA_LAYER_NAME];
bke_id_attribute_rename_if_exists(id,
- BKE_uv_map_vert_selection_name_get(layer->name, buffer_src),
- BKE_uv_map_vert_selection_name_get(result_name, buffer_dst),
+ BKE_uv_map_vert_select_name_get(layer->name, buffer_src),
+ BKE_uv_map_vert_select_name_get(result_name, buffer_dst),
reports);
bke_id_attribute_rename_if_exists(id,
- BKE_uv_map_edge_selection_name_get(layer->name, buffer_src),
- BKE_uv_map_edge_selection_name_get(result_name, buffer_dst),
+ BKE_uv_map_edge_select_name_get(layer->name, buffer_src),
+ BKE_uv_map_edge_select_name_get(result_name, buffer_dst),
reports);
bke_id_attribute_rename_if_exists(id,
BKE_uv_map_pin_name_get(layer->name, buffer_src),
@@ -243,10 +243,10 @@ static bool unique_name_cb(void *arg, const char *name)
bool BKE_id_attribute_calc_unique_name(ID *id, const char *name, char *outname)
{
AttrUniqueData data{id};
- int maxlength = MAX_CUSTOMDATA_LAYER_NAME_GUI;
+ int maxlength = MAX_CUSTOMDATA_LAYER_NAME_NO_PREFIX;
- if (STREQLEN("." UV_VERTSEL_NAME ".", name, 4) || STREQLEN("." UV_EDGESEL_NAME ".", name, 4) ||
- STREQLEN("." UV_PINNED_NAME ".", name, 4)) {
+ if (STRPREFIX(name, "." UV_VERTSEL_NAME ".") || STRPREFIX(name, "." UV_EDGESEL_NAME ".") ||
+ STRPREFIX(name, "." UV_PINNED_NAME ".")) {
maxlength = MAX_CUSTOMDATA_LAYER_NAME;
}
@@ -351,11 +351,11 @@ CustomDataLayer *BKE_id_attribute_duplicate(ID *id, const char *name, ReportList
char buffer_dst[MAX_CUSTOMDATA_LAYER_NAME];
bke_id_attribute_copy_if_exists(id,
- BKE_uv_map_vert_selection_name_get(name, buffer_src),
- BKE_uv_map_vert_selection_name_get(uniquename, buffer_dst));
+ BKE_uv_map_vert_select_name_get(name, buffer_src),
+ BKE_uv_map_vert_select_name_get(uniquename, buffer_dst));
bke_id_attribute_copy_if_exists(id,
- BKE_uv_map_edge_selection_name_get(name, buffer_src),
- BKE_uv_map_edge_selection_name_get(uniquename, buffer_dst));
+ BKE_uv_map_edge_select_name_get(name, buffer_src),
+ BKE_uv_map_edge_select_name_get(uniquename, buffer_dst));
bke_id_attribute_copy_if_exists(id,
BKE_uv_map_pin_name_get(name, buffer_src),
BKE_uv_map_pin_name_get(uniquename, buffer_dst));
@@ -391,9 +391,9 @@ bool BKE_id_attribute_remove(ID *id, const char *name, ReportList *reports)
/* free associated UV map bool layers */
char buffer_src[MAX_CUSTOMDATA_LAYER_NAME];
BM_data_layer_free_named(
- em->bm, data, BKE_uv_map_vert_selection_name_get(name, buffer_src));
+ em->bm, data, BKE_uv_map_vert_select_name_get(name, buffer_src));
BM_data_layer_free_named(
- em->bm, data, BKE_uv_map_edge_selection_name_get(name, buffer_src));
+ em->bm, data, BKE_uv_map_edge_select_name_get(name, buffer_src));
BM_data_layer_free_named(em->bm, data, BKE_uv_map_pin_name_get(name, buffer_src));
}
}
@@ -428,8 +428,8 @@ bool BKE_id_attribute_remove(ID *id, const char *name, ReportList *reports)
if (metadata->data_type == CD_PROP_FLOAT2) {
/* remove UV sub-attributes. */
char buffer_src[MAX_CUSTOMDATA_LAYER_NAME];
- BKE_id_attribute_remove(id, BKE_uv_map_vert_selection_name_get(name, buffer_src), reports);
- BKE_id_attribute_remove(id, BKE_uv_map_edge_selection_name_get(name, buffer_src), reports);
+ BKE_id_attribute_remove(id, BKE_uv_map_vert_select_name_get(name, buffer_src), reports);
+ BKE_id_attribute_remove(id, BKE_uv_map_edge_select_name_get(name, buffer_src), reports);
BKE_id_attribute_remove(id, BKE_uv_map_pin_name_get(name, buffer_src), reports);
}
}
@@ -881,7 +881,7 @@ void BKE_id_attribute_copy_domains_temp(short id_type,
*((short *)r_id->name) = id_type;
}
-const char *BKE_uv_map_vert_selection_name_get(const char *uv_map_name, char *buffer)
+const char *BKE_uv_map_vert_select_name_get(const char *uv_map_name, char *buffer)
{
BLI_assert(strlen(UV_VERTSEL_NAME) == 2);
BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 4);
@@ -889,7 +889,7 @@ const char *BKE_uv_map_vert_selection_name_get(const char *uv_map_name, char *bu
return buffer;
}
-const char *BKE_uv_map_edge_selection_name_get(const char *uv_map_name, char *buffer)
+const char *BKE_uv_map_edge_select_name_get(const char *uv_map_name, char *buffer)
{
BLI_assert(strlen(UV_EDGESEL_NAME) == 2);
BLI_assert(strlen(uv_map_name) < MAX_CUSTOMDATA_LAYER_NAME - 4);
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index 3c0f434d17d..4e34f835c4e 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -4319,7 +4319,7 @@ void CustomData_set_layer_unique_name(CustomData *data, const int index)
return;
}
- int maxlength = MAX_CUSTOMDATA_LAYER_NAME_GUI;
+ int maxlength = MAX_CUSTOMDATA_LAYER_NAME_NO_PREFIX;
if (STREQLEN("." UV_VERTSEL_NAME ".", nlayer->name, 4) ||
STREQLEN("." UV_EDGESEL_NAME ".", nlayer->name, 4) ||
diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
index 913510b25ec..dc1a428231e 100644
--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@@ -1484,10 +1484,9 @@ void BKE_mesh_legacy_convert_uvs_to_struct(
char edge_name[MAX_CUSTOMDATA_LAYER_NAME];
char pin_name[MAX_CUSTOMDATA_LAYER_NAME];
for (const CustomDataLayer &layer : face_corner_layers_to_write) {
- uv_sublayers_to_skip.add_multiple_new(
- {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)});
+ 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) {
@@ -1507,9 +1506,9 @@ 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_uv_map_vert_selection_name_get(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
+ BKE_uv_map_vert_select_name_get(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
const VArray<bool> edge_selection = attributes.lookup_or_default<bool>(
- BKE_uv_map_edge_selection_name_get(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
+ BKE_uv_map_edge_select_name_get(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
const VArray<bool> pin = attributes.lookup_or_default<bool>(
BKE_uv_map_pin_name_get(layer.name, buffer), ATTR_DOMAIN_CORNER, false);
@@ -1609,7 +1608,7 @@ void BKE_mesh_legacy_convert_uvs_to_generic(Mesh *mesh)
CD_ASSIGN,
vert_selection,
mesh->totloop,
- BKE_uv_map_vert_selection_name_get(name.c_str(), buffer));
+ BKE_uv_map_vert_select_name_get(name.c_str(), buffer))
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list