[Bf-blender-cvs] [0ce3e2ae8df] refactor-mesh-uv-map-generic: Various small cleanups to diff (whitespace, etc)

[Hans Goudey]

Commit: 0ce3e2ae8df9b9f7368e59abc0affd76dcf770a5
Author: Hans Goudey
Date:   Thu Dec 15 12:07:35 2022 -0600
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB0ce3e2ae8df9b9f7368e59abc0affd76dcf770a5

Various small cleanups to diff (whitespace, etc)

===================================================================

M	source/blender/blenkernel/BKE_mesh_legacy_convert.h
M	source/blender/blenkernel/intern/customdata.cc
M	source/blender/blenkernel/intern/pbvh_pixels.cc
M	source/blender/blenkernel/intern/subdiv_mesh.cc
M	source/blender/draw/intern/mesh_extractors/extract_mesh.cc
M	source/blender/editors/include/ED_uvedit.h
M	source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc

===================================================================

diff --git a/source/blender/blenkernel/BKE_mesh_legacy_convert.h b/source/blender/blenkernel/BKE_mesh_legacy_convert.h
index 499c226c781..fee85d4b06e 100644
--- a/source/blender/blenkernel/BKE_mesh_legacy_convert.h
+++ b/source/blender/blenkernel/BKE_mesh_legacy_convert.h
@@ -10,7 +10,6 @@
 #include "BLI_utildefines.h"
 
 #ifdef __cplusplus
-#  include "BLI_array.hh"
 #  include "BLI_resource_scope.hh"
 #  include "BLI_span.hh"
 #  include "BLI_vector.hh"
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index cb87bd2e95d..cf6a9b18c8c 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -1520,7 +1520,6 @@ static bool layerEqual_propfloat2(const void *data1, const void *data2)
 {
   const float2 &a = *static_cast<const float2 *>(data1);
   const float2 &b = *static_cast<const float2 *>(data2);
-
   return blender::math::distance_squared(a, b) < 0.00001f;
 }
 
@@ -4170,7 +4169,6 @@ void CustomData_from_bmesh_block(const CustomData *source,
   /* copies a layer at a time */
   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;
     }
@@ -4418,7 +4416,9 @@ static bool CustomData_layer_ensure_data_exists(CustomDataLayer *layer, size_t c
   switch (layer->type) {
     /* When more instances of corrupt files are found, add them here. */
     case CD_PROP_BOOL: /* See T84935. */
-    case CD_MLOOPUV:   /* See T90620. */        /*TODO(@Baardaap) check if this is run before or after versioning. If after we need to add CD_PROP_FLOAT2 to the list? */
+    case CD_MLOOPUV:   /* See T90620. */
+      /* TODO(@Baardaap) check if this is run before or after versioning. If after we need to add
+       * #CD_PROP_FLOAT2 to the list? */
       layer->data = MEM_calloc_arrayN(count, typeInfo->size, layerType_getName(layer->type));
       BLI_assert(layer->data);
       if (typeInfo->set_default_value) {
diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index 42af0cbac9c..884da8b89f0 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -357,7 +357,6 @@ static void update_pixels(PBVH *pbvh, Mesh *mesh, Image *image, ImageUser *image
 
   const float2 *ldata_uv = static_cast<const float2 *>(
       CustomData_get_layer(&mesh->ldata, CD_PROP_FLOAT2));
-
   if (ldata_uv == nullptr) {
     return;
   }
diff --git a/source/blender/blenkernel/intern/subdiv_mesh.cc b/source/blender/blenkernel/intern/subdiv_mesh.cc
index 93c61220b54..55c1400c8bb 100644
--- a/source/blender/blenkernel/intern/subdiv_mesh.cc
+++ b/source/blender/blenkernel/intern/subdiv_mesh.cc
@@ -30,7 +30,6 @@
 #include "MEM_guardedalloc.h"
 
 using blender::float2;
-
 using blender::Span;
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh.cc
index 98edb1c4e3c..72d7c31110f 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh.cc
@@ -143,7 +143,6 @@ void mesh_render_data_loop_edge_flag(const MeshRenderData *mr,
   if (offsets.uv == -1) {
     return;
   }
-
   if (uvedit_edge_select_test_ex(mr->toolsettings, l, offsets)) {
     eattr->v_flag |= VFLAG_EDGE_UV_SELECT;
     eattr->v_flag |= VFLAG_VERT_UV_SELECT;
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index 465f1255ee0..7aa745abdf6 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -32,7 +32,6 @@ struct bContext;
 struct bNode;
 struct bNodeTree;
 struct wmKeyConfig;
-struct BMUVOffsets;
 
 /* uvedit_ops.c */
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc
index ea1b9eacd5a..d866f337a00 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc
@@ -41,10 +41,9 @@ static Mesh *create_ico_sphere_mesh(const int subdivisions,
   const BMAllocTemplate allocsize = {0, 0, 0, 0};
   BMesh *bm = BM_mesh_create(&allocsize, &bmesh_create_params);
   BM_data_layer_add_named(bm, &bm->ldata, CD_PROP_FLOAT2, "UVMap");
-  /* Make sure the associated bool layers exists as well.
-   * Normally this would be done when adding a UV layer via python
-   * or when copying from Mesh, but when we 'manually' create the UV layer
-   * we need to make sure the bool layers exist as well. */
+  /* Make sure the associated boolean layers exists as well. Normally this would be done when
+   * adding a UV layer via python or when copying from Mesh, but when we 'manually' create the UV
+   * layer we need to make sure the bool layers exist as well. */
   BM_uv_map_ensure_selection_and_pin_attributes(bm);
 
   BMO_op_callf(bm,