[Bf-blender-cvs] [1df6ac5ffb9] refactor-mesh-uv-map-generic: Cleanup: make format
Martijn Versteegh
noreply at git.blender.org
Thu Jan 5 20:15:48 CET 2023
Commit: 1df6ac5ffb955c785999879dc7b27b6a8fabdfbb
Author: Martijn Versteegh
Date: Thu Jan 5 19:49:59 2023 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB1df6ac5ffb955c785999879dc7b27b6a8fabdfbb
Cleanup: make format
===================================================================
M source/blender/bmesh/intern/bmesh_mesh_convert.cc
M source/blender/editors/mesh/mesh_data.cc
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
index a851d7d5efa..231e688508f 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
@@ -151,23 +151,25 @@ 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 layer_index : 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, layer_index),
- name);
+ 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, layer_index),
- name);
+ 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, layer_index), 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,7 +987,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 layer_index : IndexRange(CustomData_number_of_layers(&bm->ldata, CD_PROP_FLOAT2))) {
+ 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(
diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc
index 1adf1354130..cb685baa13d 100644
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@ -328,11 +328,9 @@ int ED_mesh_uv_add(
return layernum_dst;
}
-static const bool *mesh_loop_boolean_custom_data_get_by_name(const Mesh &mesh,
- const char *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));
+ return static_cast<const bool *>(CustomData_get_layer_named(&mesh.ldata, CD_PROP_BOOL, name));
}
const bool *ED_mesh_uv_map_get_vert_select(const Mesh *mesh, const int uv_index)
@@ -340,7 +338,8 @@ 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 mesh_loop_boolean_custom_data_get_by_name(*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));
}
/* UV map edge selections are stored on face corners (loops) and not on edges
* because we need selections per face edge, even when the edge is split in UV space. */
@@ -349,7 +348,8 @@ 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 mesh_loop_boolean_custom_data_get_by_name(*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)
@@ -357,7 +357,8 @@ 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 mesh_loop_boolean_custom_data_get_by_name(*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)
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 712d5af7a65..4a9518aad98 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -1813,7 +1813,7 @@ static bool get_uv_index_and_layer(const PointerRNA *ptr,
&mesh->ldata, CD_PROP_FLOAT2, layer_i);
const ptrdiff_t index = uv_coord - layer_data;
if (index >= 0 && index < mesh->totloop) {
- *r_uv_layer_index = layer_i;
+ *r_uv_layer_index = layer_i;
*r_index_in_attribute = index;
return true;
}
@@ -2231,7 +2231,7 @@ static PointerRNA rna_Mesh_uv_layers_new(struct Mesh *me,
static void rna_Mesh_uv_layers_remove(struct Mesh *me, ReportList *reports, CustomDataLayer *layer)
{
if (!BKE_id_attribute_find(&me->id, layer->name, CD_PROP_FLOAT, ATTR_DOMAIN_CORNER)) {
- BKE_reportf(reports, RPT_ERROR, "Texture layer '%s' not found", layer->name);
+ BKE_reportf(reports, RPT_ERROR, "Texture layer '%s' not found", layer->name);
}
BKE_id_attribute_remove(&me->id, layer->name, reports);
}
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c
index 5e0af19ce50..21fa551f414 100644
--- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c
+++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c
@@ -186,9 +186,11 @@ PyObject *BPy_BMLoopUV_CreatePyObject(struct BMesh *bm, BMLoop *loop)
const BMUVOffsets offsets = BM_uv_map_get_offsets(bm);
self->uv = BM_ELEM_CD_GET_FLOAT_P(loop, offsets.uv);
- self->vert_select = offsets.select_vert >= 0 ? BM_ELEM_CD_GET_BOOL_P(loop, offsets.select_vert) : NULL;
- self->edge_select = offsets.select_edge >= 0 ? BM_ELEM_CD_GET_BOOL_P(loop, offsets.select_edge) : NULL;
- self->pin = offsets.pin >=0 ? BM_ELEM_CD_GET_BOOL_P(loop, offsets.pin) : NULL;
+ self->vert_select = offsets.select_vert >= 0 ? BM_ELEM_CD_GET_BOOL_P(loop, offsets.select_vert) :
+ NULL;
+ self->edge_select = offsets.select_edge >= 0 ? BM_ELEM_CD_GET_BOOL_P(loop, offsets.select_edge) :
+ NULL;
+ self->pin = offsets.pin >= 0 ? BM_ELEM_CD_GET_BOOL_P(loop, offsets.pin) : NULL;
return (PyObject *)self;
}
More information about the Bf-blender-cvs
mailing list