Cleanup: Use blender::int2 instead of vec2i

source/blender/blenkernel/BKE_DerivedMesh.hh

@@ -58,7 +58,6 @@ struct CCGElem;
 struct CCGKey;
 struct CustomData_MeshMasks;
 struct Depsgraph;
-struct vec2i;
 struct MFace;
 struct Mesh;
 struct ModifierData;
@@ -97,7 +96,7 @@ struct DerivedMesh {
    * \warning The real return type is `float(*)[3]`.
    */
   float *(*getVertArray)(DerivedMesh *dm);
-  vec2i *(*getEdgeArray)(DerivedMesh *dm);
+  blender::int2 *(*getEdgeArray)(DerivedMesh *dm);
   int *(*getCornerVertArray)(DerivedMesh *dm);
   int *(*getCornerEdgeArray)(DerivedMesh *dm);
   int *(*getPolyArray)(DerivedMesh *dm);
@@ -106,7 +105,7 @@ struct DerivedMesh {
    * *{vert/edge/face}_r (must point to a buffer large enough)
    */
   void (*copyVertArray)(DerivedMesh *dm, float (*r_positions)[3]);
-  void (*copyEdgeArray)(DerivedMesh *dm, vec2i *r_edge);
+  void (*copyEdgeArray)(DerivedMesh *dm, blender::int2 *r_edge);
   void (*copyCornerVertArray)(DerivedMesh *dm, int *r_corner_verts);
   void (*copyCornerEdgeArray)(DerivedMesh *dm, int *r_corner_edges);
   void (*copyPolyArray)(DerivedMesh *dm, int *r_face_offsets);

source/blender/blenkernel/BKE_bvhutils.hh

@@ -22,7 +22,6 @@ struct BVHTree;
 struct MFace;
 struct Mesh;
 struct PointCloud;
-struct vec2i;
 
 /**
  * Struct that stores basic information about a BVHTree built from a edit-mesh.

source/blender/blenkernel/intern/DerivedMesh.cc

@@ -109,13 +109,13 @@ static float *dm_getVertArray(DerivedMesh *dm)
   return (float *)positions;
 }
 
-static vec2i *dm_getEdgeArray(DerivedMesh *dm)
+static blender::int2 *dm_getEdgeArray(DerivedMesh *dm)
 {
-  vec2i *edge = (vec2i *)CustomData_get_layer_named_for_write(
+  blender::int2 *edge = (blender::int2 *)CustomData_get_layer_named_for_write(
       &dm->edgeData, CD_PROP_INT32_2D, ".edge_verts", dm->getNumEdges(dm));
 
   if (!edge) {
-    edge = (vec2i *)CustomData_add_layer_named(
+    edge = (blender::int2 *)CustomData_add_layer_named(
         &dm->edgeData, CD_PROP_INT32_2D, CD_SET_DEFAULT, dm->getNumEdges(dm), ".edge_verts");
     CustomData_set_layer_flag(&dm->edgeData, CD_PROP_INT32_2D, CD_FLAG_TEMPORARY);
     dm->copyEdgeArray(dm, edge);

source/blender/blenkernel/intern/cdderivedmesh.cc

@@ -38,7 +38,7 @@ struct CDDerivedMesh {
   /* these point to data in the DerivedMesh custom data layers,
    * they are only here for efficiency and convenience */
   float (*vert_positions)[3];
-  vec2i *medge;
+  blender::int2 *medge;
   MFace *mface;
   int *corner_verts;
   int *corner_edges;
@@ -79,7 +79,7 @@ static void cdDM_copyVertArray(DerivedMesh *dm, float (*r_positions)[3])
   memcpy(r_positions, cddm->vert_positions, sizeof(float[3]) * dm->numVertData);
 }
 
-static void cdDM_copyEdgeArray(DerivedMesh *dm, vec2i *r_edge)
+static void cdDM_copyEdgeArray(DerivedMesh *dm, blender::int2 *r_edge)
 {
   CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
   memcpy(r_edge, cddm->medge, sizeof(*r_edge) * dm->numEdgeData);
@@ -175,7 +175,7 @@ static DerivedMesh *cdDM_from_mesh_ex(Mesh *mesh, const CustomData_MeshMasks *ma
 
   cddm->vert_positions = static_cast<float(*)[3]>(CustomData_get_layer_named_for_write(
       &dm->vertData, CD_PROP_FLOAT3, "position", mesh->verts_num));
-  cddm->medge = static_cast<vec2i *>(CustomData_get_layer_named_for_write(
+  cddm->medge = static_cast<blender::int2 *>(CustomData_get_layer_named_for_write(
       &dm->edgeData, CD_PROP_INT32_2D, ".edge_verts", mesh->edges_num));
   cddm->corner_verts = static_cast<int *>(CustomData_get_layer_named_for_write(
       &dm->loopData, CD_PROP_INT32, ".corner_vert", mesh->corners_num));

source/blender/blenkernel/intern/customdata.cc

@@ -1825,7 +1825,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
     /* 45: CD_PROP_INT8 */
     {sizeof(int8_t), "MInt8Property", 1, N_("Int8"), nullptr, nullptr, nullptr, nullptr, nullptr},
     /* 46: CD_PROP_INT32_2D */
-    {sizeof(vec2i), "vec2i", 1, N_("Int 2D"), nullptr, nullptr, nullptr, nullptr, nullptr},
+    {sizeof(blender::int2), "vec2i", 1, N_("Int 2D"), nullptr, nullptr, nullptr, nullptr, nullptr},
     /* 47: CD_PROP_COLOR */
     {sizeof(MPropCol),
      "MPropCol",

source/blender/blenkernel/intern/subsurf_ccg.cc

@@ -820,13 +820,13 @@ static void ccgDM_copyFinalVertArray(DerivedMesh *dm, float (*r_positions)[3])
 }
 
 /* utility function */
-BLI_INLINE void ccgDM_to_MEdge(vec2i *edge, const int v1, const int v2)
+BLI_INLINE void ccgDM_to_MEdge(blender::int2 *edge, const int v1, const int v2)
 {
   edge->x = v1;
   edge->y = v2;
 }
 
-static void ccgDM_copyFinalEdgeArray(DerivedMesh *dm, vec2i *edges)
+static void ccgDM_copyFinalEdgeArray(DerivedMesh *dm, blender::int2 *edges)
 {
   CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm;
   CCGSubSurf *ss = ccgdm->ss;

source/blender/editors/physics/particle_object.cc

@@ -706,7 +706,7 @@ static bool remap_hair_emitter(Depsgraph *depsgraph,
   PTCacheEditKey *ekey;
   BVHTreeFromMesh bvhtree = {nullptr};
   const MFace *mface = nullptr, *mf;
-  const vec2i *edges = nullptr, *edge;
+  const blender::int2 *edges = nullptr, *edge;
   Mesh *mesh, *target_mesh;
   int numverts;
   int k;
@@ -763,7 +763,7 @@ static bool remap_hair_emitter(Depsgraph *depsgraph,
     BKE_bvhtree_from_mesh_get(&bvhtree, mesh, BVHTREE_FROM_FACES, 2);
   }
   else if (mesh->edges_num != 0) {
-    edges = static_cast<const vec2i *>(
+    edges = static_cast<const blender::int2 *>(
         CustomData_get_layer_named(&mesh->edge_data, CD_PROP_INT32_2D, ".edge_verts"));
     BKE_bvhtree_from_mesh_get(&bvhtree, mesh, BVHTREE_FROM_EDGES, 2);
   }