[Bf-blender-cvs] [84b3e6c3e5e] refactor-mesh-uv-map-generic: Cleanup: make format
Martijn Versteegh
noreply at git.blender.org
Tue Dec 6 12:56:38 CET 2022
Commit: 84b3e6c3e5ef0d5311e6ab4aaf6f7275d0baf553
Author: Martijn Versteegh
Date: Tue Dec 6 12:56:22 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB84b3e6c3e5ef0d5311e6ab4aaf6f7275d0baf553
Cleanup: make format
===================================================================
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/editors/mesh/mesh_data.cc
M source/blender/editors/sculpt_paint/paint_image_proj.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc
index 9be3d627b76..3fc93f981d7 100644
--- a/source/blender/blenkernel/intern/attribute.cc
+++ b/source/blender/blenkernel/intern/attribute.cc
@@ -838,4 +838,3 @@ char const *BKE_get_uv_map_pin_name(char const *uv_map_name, char *buffer)
BLI_snprintf(buffer, MAX_CUSTOMDATA_LAYER_NAME, ".%s.%s", UV_PINNED_NAME, uv_map_name);
return buffer;
}
-
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index 938789eb9ac..a3d3c0a26c6 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -4171,9 +4171,9 @@ void CustomData_from_bmesh_block(const CustomData *source,
int dest_i = 0;
for (int src_i = 0; src_i < source->totlayer; src_i++) {
- if (source->layers[src_i].flag & CD_FLAG_NOCOPY) {
- continue;
- }
+ if (source->layers[src_i].flag & CD_FLAG_NOCOPY) {
+ continue;
+ }
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
index 691705c4d0a..7ede253519e 100644
--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@@ -1477,9 +1477,10 @@ 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_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)});
+ 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)});
}
for (const CustomDataLayer &layer : face_corner_layers_to_write) {
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index 29e754fc683..6a8d7c99b8c 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -880,7 +880,8 @@ void BM_uv_map_ensure_selection_pin_attributes(BMesh *bm, const char *uv_map_nam
bm, &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_vert_selection_name(uv_map_name, name));
BM_data_layer_ensure_named(
bm, &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_edge_selection_name(uv_map_name, name));
- BM_data_layer_ensure_named(bm, &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_pin_name(uv_map_name, name));
+ BM_data_layer_ensure_named(
+ bm, &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_pin_name(uv_map_name, name));
}
void BM_uv_map_ensure_vert_selection_attribute(BMesh *bm, const char *uv_map_name)
@@ -900,7 +901,8 @@ void BM_uv_map_ensure_edge_selection_attribute(BMesh *bm, const char *uv_map_nam
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_data_layer_ensure_named(
+ bm, &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_pin_name(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 d7a2dc1c16d..22d28a67030 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
@@ -154,14 +154,14 @@ 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),
- name);
+ 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_get_uv_map_edge_selection_name(CustomData_get_layer_name(&mesh_ldata, CD_PROP_FLOAT2, l),
- name);
+ 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);
@@ -987,13 +987,15 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh
/* 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);
char sub_layer_name[MAX_CUSTOMDATA_LAYER_NAME];
- int vertsel_layer_index = CustomData_get_named_layer_index(&bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_vert_selection_name(layer_name, sub_layer_name));
- int edgesel_layer_index = CustomData_get_named_layer_index(&bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_edge_selection_name(layer_name, sub_layer_name));
- int pin_layer_index = CustomData_get_named_layer_index(&bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_pin_name(layer_name, sub_layer_name));
+ int vertsel_layer_index = CustomData_get_named_layer_index(
+ &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_vert_selection_name(layer_name, sub_layer_name));
+ int edgesel_layer_index = CustomData_get_named_layer_index(
+ &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_edge_selection_name(layer_name, sub_layer_name));
+ int pin_layer_index = CustomData_get_named_layer_index(
+ &bm->ldata, CD_PROP_BOOL, BKE_get_uv_map_pin_name(layer_name, sub_layer_name));
int vertsel_offset = bm->ldata.layers[vertsel_layer_index].offset;
int edgesel_offset = bm->ldata.layers[edgesel_layer_index].offset;
int pin_offset = bm->ldata.layers[pin_layer_index].offset;
@@ -1005,32 +1007,32 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh
BMIter liter;
BMLoop *l;
BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
- need_vertsel |= BM_ELEM_CD_GET_BOOL(l, vertsel_offset);
- need_edgesel |= BM_ELEM_CD_GET_BOOL(l, edgesel_offset);
- need_pin |= BM_ELEM_CD_GET_BOOL(l, pin_offset);
+ need_vertsel |= BM_ELEM_CD_GET_BOOL(l, vertsel_offset);
+ need_edgesel |= BM_ELEM_CD_GET_BOOL(l, edgesel_offset);
+ need_pin |= BM_ELEM_CD_GET_BOOL(l, pin_offset);
}
}
if (need_vertsel) {
- bm->ldata.layers[vertsel_layer_index].flag &= ~CD_FLAG_NOCOPY;
- } else {
- bm->ldata.layers[vertsel_layer_index].flag |= CD_FLAG_NOCOPY;
+ bm->ldata.layers[vertsel_layer_index].flag &= ~CD_FLAG_NOCOPY;
+ }
+ else {
+ bm->ldata.layers[vertsel_layer_index].flag |= CD_FLAG_NOCOPY;
}
if (need_edgesel) {
- bm->ldata.layers[edgesel_layer_index].flag &= ~CD_FLAG_NOCOPY;
- } else {
- bm->ldata.layers[edgesel_layer_index].flag |= CD_FLAG_NOCOPY;
+ bm->ldata.layers[edgesel_layer_index].flag &= ~CD_FLAG_NOCOPY;
+ }
+ else {
+ bm->ldata.layers[edgesel_layer_index].flag |= CD_FLAG_NOCOPY;
}
if (need_pin) {
- bm->ldata.layers[pin_layer_index].flag &= ~CD_FLAG_NOCOPY;
- } else {
- bm->ldata.layers[pin_layer_index].flag |= CD_FLAG_NOCOPY;
+ bm->ldata.layers[pin_layer_index].flag &= ~CD_FLAG_NOCOPY;
+ }
+ else {
+ bm->ldata.layers[pin_layer_index].flag |= CD_FLAG_NOCOPY;
}
-
-
}
-
{
CustomData_MeshMasks mask = CD_MASK_MESH;
CustomData_MeshMasks_update(&mask, ¶ms->cd_mask_extra);
diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc
index c0d1d200306..270d1dd2350 100644
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@ -341,14 +341,16 @@ bool *ED_mesh_uv_map_ensure_vert_selection(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 ensure_corner_boolean_attribute(*mesh, BKE_get_uv_map_vert_selection_name(uv_name, buffer));
+ return ensure_corner_boolean_attribute(*mesh,
+ BKE_get_uv_map_vert_selection_name(uv_name, buffer));
}
bool *ED_mesh_uv_map_ensure_edge_selection(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 ensure_corner_boolean_attribute(*mesh, BKE_get_uv_map_edge_selection_name(uv_name, buffer));
+ return ensure_corner_boolean_attribute(*mesh,
+ BKE_get_uv_map_edge_selection_name(uv_name, buffer));
}
bool *ED_mesh_uv_map_ensure_pin(Mesh *mesh, const int uv_index)
{
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc
index fb0191de298..f4acdbe405d 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.cc
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc
@@ -4112,8 +4112,8 @@ static void proj_paint_layer_clone_init(ProjPaintState *ps, ProjPaintLayerClone
MEM_mallocN(ps->totpoly_eval * sizeof(float(*)[2]), "proj_paint_mtfaces"));
if (layer_num != -1) {
- mloopuv_clone_base = static_cast <const float(*)[2]>(CustomData_get_layer_n(
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list