Commit: b5f4659afa7f5adc2f1a92128f99175ba3427157 Author: Martijn Versteegh Date: Thu Jan 5 14:48:09 2023 +0100 Branches: refactor-mesh-uv-map-generic https://developer.blender.org/rBb5f4659afa7f5adc2f1a92128f99175ba3427157
Made some function/variable names longer, others shorter as requested in the review =================================================================== M source/blender/bmesh/intern/bmesh_interp.c M source/blender/bmesh/intern/bmesh_interp.h M source/blender/bmesh/intern/bmesh_mesh_convert.cc M source/blender/editors/include/ED_mesh.h M source/blender/editors/mesh/mesh_data.cc M source/blender/editors/uvedit/uvedit_ops.c M source/blender/editors/uvedit/uvedit_rip.c M source/blender/editors/uvedit/uvedit_select.c M source/blender/editors/uvedit/uvedit_unwrap_ops.c M source/blender/makesrna/intern/rna_mesh.c M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc M source/blender/python/bmesh/bmesh_py_types_customdata.c M source/blender/python/bmesh/bmesh_py_types_meshdata.c =================================================================== diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index 3fb6492d3fb..8a97d5f744a 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -873,11 +873,11 @@ void BM_data_layer_ensure_named(BMesh *bm, CustomData *data, int type, const cha } } -void BM_uv_map_ensure_selection_and_pin_attributes(BMesh *bm) +void BM_uv_map_ensure_select_and_pin_attrs(BMesh *bm) { const int nr_uv_layers = CustomData_number_of_layers(&bm->ldata, CD_PROP_FLOAT2); for (int l = 0; l < nr_uv_layers; l++) { - /* note: you can't re-use the returnvalue of CustomData_get_layer_name() because adding layers + /* NOTE: you can't re-use the returnvalue of CustomData_get_layer_name() because adding layers * can invalidate that. */ char name[MAX_CUSTOMDATA_LAYER_NAME]; BM_data_layer_ensure_named( @@ -900,21 +900,21 @@ void BM_uv_map_ensure_selection_and_pin_attributes(BMesh *bm) } } -void BM_uv_map_ensure_vert_selection_attribute(BMesh *bm, const char *uv_map_name) +void BM_uv_map_ensure_vert_select_attr(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_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) +void BM_uv_map_ensure_edge_select_attr(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_uv_map_edge_selection_name_get(uv_map_name, name)); } -void BM_uv_map_ensure_pin_attribute(BMesh *bm, const char *uv_map_name) +void BM_uv_map_ensure_pin_attr(BMesh *bm, const char *uv_map_name) { char name[MAX_CUSTOMDATA_LAYER_NAME]; BM_data_layer_ensure_named( diff --git a/source/blender/bmesh/intern/bmesh_interp.h b/source/blender/bmesh/intern/bmesh_interp.h index d75410c4699..013ed9d237f 100644 --- a/source/blender/bmesh/intern/bmesh_interp.h +++ b/source/blender/bmesh/intern/bmesh_interp.h @@ -66,11 +66,11 @@ void BM_data_layer_ensure_named(BMesh *bm, CustomData *data, int type, const cha void BM_data_layer_free(BMesh *bm, CustomData *data, int type); /** Ensure the dependent boolean layers exist for all face corner #CD_PROP_FLOAT2 layers. */ -void BM_uv_map_ensure_selection_and_pin_attributes(BMesh *bm); +void BM_uv_map_ensure_select_and_pin_attrs(BMesh *bm); -void BM_uv_map_ensure_vert_selection_attribute(BMesh *bm, const char *uv_map_name); -void BM_uv_map_ensure_edge_selection_attribute(BMesh *bm, const char *uv_map_name); -void BM_uv_map_ensure_pin_attribute(BMesh *bm, const char *uv_map_name); +void BM_uv_map_ensure_vert_select_attr(BMesh *bm, const char *uv_map_name); +void BM_uv_map_ensure_edge_select_attr(BMesh *bm, const char *uv_map_name); +void BM_uv_map_ensure_pin_attr(BMesh *bm, const char *uv_map_name); /** * Remove a named custom data layer, if it existed. Return true if the layer was removed. diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc index b49dd1a294a..a851d7d5efa 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc @@ -151,23 +151,23 @@ void BM_mesh_bm_from_me(BMesh *bm, const Mesh *me, const struct BMeshFromMeshPar blender::Vector<std::string> temporary_layers_to_delete; - for (const int l : IndexRange(CustomData_number_of_layers(&mesh_ldata, CD_PROP_FLOAT2))) { + for (const int layer_index : IndexRange(CustomData_number_of_layers(&mesh_ldata, CD_PROP_FLOAT2))) { char name[MAX_CUSTOMDATA_LAYER_NAME]; - BKE_uv_map_vert_selection_name_get(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, layer_index), name); if (CustomData_get_named_layer_index(&mesh_ldata, CD_PROP_BOOL, name) < 0) { CustomData_add_layer_named( &mesh_ldata, CD_PROP_BOOL, CD_SET_DEFAULT, nullptr, me->totloop, name); temporary_layers_to_delete.append(std::string(name)); } - BKE_uv_map_edge_selection_name_get(CustomData_get_layer_name(&mesh_ldata, CD_PROP_FLOAT2, l), + BKE_uv_map_edge_selection_name_get(CustomData_get_layer_name(&mesh_ldata, CD_PROP_FLOAT2, layer_index), name); if (CustomData_get_named_layer_index(&mesh_ldata, CD_PROP_BOOL, name) < 0) { CustomData_add_layer_named( &mesh_ldata, CD_PROP_BOOL, CD_SET_DEFAULT, nullptr, me->totloop, name); temporary_layers_to_delete.append(std::string(name)); } - BKE_uv_map_pin_name_get(CustomData_get_layer_name(&mesh_ldata, CD_PROP_FLOAT2, l), name); + BKE_uv_map_pin_name_get(CustomData_get_layer_name(&mesh_ldata, CD_PROP_FLOAT2, layer_index), name); if (CustomData_get_named_layer_index(&mesh_ldata, CD_PROP_BOOL, name) < 0) { CustomData_add_layer_named( &mesh_ldata, CD_PROP_BOOL, CD_SET_DEFAULT, nullptr, me->totloop, name); @@ -985,8 +985,8 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh me->act_face = -1; /* Mark UV selection layers which are all false as 'nocopy'. */ - for (const int l : IndexRange(CustomData_number_of_layers(&bm->ldata, CD_PROP_FLOAT2))) { - char const *layer_name = CustomData_get_layer_name(&bm->ldata, CD_PROP_FLOAT2, l); + for (const int layer_index : IndexRange(CustomData_number_of_layers(&bm->ldata, CD_PROP_FLOAT2))) { + char const *layer_name = CustomData_get_layer_name(&bm->ldata, CD_PROP_FLOAT2, layer_index); char sub_layer_name[MAX_CUSTOMDATA_LAYER_NAME]; int vertsel_layer_index = CustomData_get_named_layer_index( &bm->ldata, CD_PROP_BOOL, BKE_uv_map_vert_selection_name_get(layer_name, sub_layer_name)); diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 2bb816f4f84..ff1cdad15d5 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -552,11 +552,11 @@ void ED_mesh_geometry_clear(struct Mesh *mesh); void ED_mesh_update(struct Mesh *mesh, struct bContext *C, bool calc_edges, bool calc_edges_loose); -bool *ED_mesh_uv_map_ensure_vert_selection(struct Mesh *mesh, int uv_index); -bool *ED_mesh_uv_map_ensure_edge_selection(struct Mesh *mesh, int uv_index); +bool *ED_mesh_uv_map_ensure_vert_select(struct Mesh *mesh, int uv_index); +bool *ED_mesh_uv_map_ensure_edge_select(struct Mesh *mesh, int uv_index); bool *ED_mesh_uv_map_ensure_pin(struct Mesh *mesh, int uv_index); -const bool *ED_mesh_uv_map_get_vert_selection(const struct Mesh *mesh, int uv_index); -const bool *ED_mesh_uv_map_get_edge_selection(const struct Mesh *mesh, int uv_index); +const bool *ED_mesh_uv_map_get_vert_select(const struct Mesh *mesh, int uv_index); +const bool *ED_mesh_uv_map_get_edge_select(const struct Mesh *mesh, int uv_index); const bool *ED_mesh_uv_map_get_pin(const struct Mesh *mesh, int uv_index); bool ED_mesh_edge_is_loose(const struct Mesh *mesh, int index); diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc index 512c69eedb2..84bfad97bfc 100644 --- a/source/blender/editors/mesh/mesh_data.cc +++ b/source/blender/editors/mesh/mesh_data.cc @@ -278,7 +278,7 @@ int ED_mesh_uv_add( } BM_data_layer_add_named(em->bm, &em->bm->ldata, CD_PROP_FLOAT2, unique_name); - BM_uv_map_ensure_selection_and_pin_attributes(em->bm); + BM_uv_map_ensure_select_and_pin_attrs(em->bm); /* copy data from active UV */ if (layernum_dst && do_init) { const int layernum_src = CustomData_get_active_layer(&em->bm->ldata, CD_PROP_FLOAT2); @@ -328,33 +328,33 @@ int ED_mesh_uv_add( return layernum_dst; } -static const bool *get_corner_boolean_attribute(const Mesh &mesh, - const blender::StringRefNull name) +static const bool *mesh_loop_boolean_custom_data_get_by_name(const Mesh &mesh, + const char *name) { return static_cast<const bool *>( - CustomData_get_layer_named(&mesh.ldata, CD_PROP_BOOL, name.c_str())); + CustomData_get_layer_named(&mesh.ldata, CD_PROP_BOOL, name)); } -const bool *ED_mesh_uv_map_get_vert_selection(const Mesh *mesh, const int uv_index) +const bool *ED_mesh_uv_map_get_vert_select(const Mesh *mesh, const int uv_index) { using namespace blender::bke; char buffer[MAX_CUSTOMDATA_LAYER_NAME]; const char *uv_name = CustomData_get_layer_name(&mesh->ldata, CD_PROP_FLOAT2, uv_index); - return get_corner_boolean_attribute(*mesh, BKE_uv_map_vert_selection_name_get(uv_name, buffer)); + return mesh_loop_boolean_custom_data_get_by_name(*mesh, BKE_uv_map_vert_selection_name_get(uv_name, buffer)); } -const bool *ED_mesh_uv_map_get_edge_selection(const Mesh *mesh, const int uv_index) +const bool *ED_mesh_uv_map_get_edge_select(const Mesh *mesh, const int uv_index) { using namespace blender::bke; char buffer[MAX_CUSTOMDATA_LAYER_NAME]; const char *uv_name = CustomData_get_layer_name(&mesh->ldata, CD_PROP_FLOAT2, uv_index); - return get_corner_boolean_attribute(*mesh, BKE_uv_map_edge_selection_name_get(uv_name, buffer)); + return mesh_loop_boolean_custom_data_get_by_name(*mesh, BKE_uv_map_edge_selection_name_get(uv_name, buffer)); } const bool *ED_mesh_uv_map_get_pin(const Mesh *mesh, const int uv_index) { using namespace blender::bke; char buffer[MAX_CUSTOMDATA_LAYER_NAME]; const char *uv_name = CustomData_get_layer_name(&mesh->ldata, CD_PROP_FLOAT2, uv_index); - return get_corner_boolean_attribute(*mesh, BKE_uv_map_pin_name_get(uv_name, buffer)); + return mesh_loop_boolean_custom_data_get_by_name(*mesh, BKE_uv_map_pin_name_get(uv_name, buffer)); } static bool *ensure_corner_boolean_attribute(Mesh &mesh, const blender::StringRefNull name) @@ -368,7 +368,7 @@ static bool *ensure_corner_boolean_attribute(Mesh &mesh, const blender::StringRe return data; } -bool *ED_mesh_uv_map_ensure_vert_s @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs