[Bf-blender-cvs] [1c2342bc131] temp-T97352-3d-texturing-seam-bleeding-b2: Renamed flip to flip_order.

Jeroen Bakker noreply at git.blender.org
Tue Sep 20 15:23:01 CEST 2022


Commit: 1c2342bc131d5ee4f3c054b9f54076d91d7e1ac9
Author: Jeroen Bakker
Date:   Tue Sep 20 12:28:32 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rB1c2342bc131d5ee4f3c054b9f54076d91d7e1ac9

Renamed flip to flip_order.

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

M	source/blender/blenkernel/BKE_uv_islands.hh
M	source/blender/blenkernel/intern/uv_islands.cc

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

diff --git a/source/blender/blenkernel/BKE_uv_islands.hh b/source/blender/blenkernel/BKE_uv_islands.hh
index 75357b4f706..6a49b4d3dab 100644
--- a/source/blender/blenkernel/BKE_uv_islands.hh
+++ b/source/blender/blenkernel/BKE_uv_islands.hh
@@ -531,7 +531,6 @@ struct UVBorderCorner {
 
 struct UVBorder {
   /** Ordered list of UV Verts of the border of this island. */
-  // TODO: support multiple rings + order (CW, CCW)
   Vector<UVBorderEdge> edges;
 
   /**
@@ -542,7 +541,7 @@ struct UVBorder {
   /**
    * Flip the order of the verts, changing the order between CW and CCW.
    */
-  void flip();
+  void flip_order();
 
   /**
    * Calculate the outside angle of the given vert.
diff --git a/source/blender/blenkernel/intern/uv_islands.cc b/source/blender/blenkernel/intern/uv_islands.cc
index b5feb8d7851..b73df29beaf 100644
--- a/source/blender/blenkernel/intern/uv_islands.cc
+++ b/source/blender/blenkernel/intern/uv_islands.cc
@@ -86,7 +86,7 @@ void UVIsland::extract_borders()
       break;
     }
     if (!border->is_ccw()) {
-      border->flip();
+      border->flip_order();
     }
     borders.append(*border);
   }
@@ -639,7 +639,7 @@ bool UVBorder::is_ccw() const
   return ccw;
 }
 
-void UVBorder::flip()
+void UVBorder::flip_order()
 {
   uint64_t border_index = edges.first().border_index;
   for (UVBorderEdge &edge : edges) {



More information about the Bf-blender-cvs mailing list