From 248def7e480666682c80a2e778a5f0cf39a3a2a1 Mon Sep 17 00:00:00 2001
From: Hans Goudey <h.goudey@me.com>
Date: Mon, 3 Oct 2022 16:27:09 -0500
Subject: Geometry Nodes: Change order of outputs in topology nodes

It's a bit more natural if the "Total" output come second, and it's
also consistent with the Accumulate Field node.
---
 .../nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc | 6 +++---
 .../nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc  | 6 +++---
 .../geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc      | 6 +++---
 .../nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc  | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc
index 62a8ba9a976..9f3d3c2caf3 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc
@@ -21,12 +21,12 @@ static void node_declare(NodeDeclarationBuilder &b)
       .min(0)
       .supports_field()
       .description(N_("Which of the sorted points to output"));
-  b.add_output<decl::Int>(N_("Total"))
-      .dependent_field()
-      .description(N_("The number of points in the curve"));
   b.add_output<decl::Int>(N_("Point Index"))
       .dependent_field()
       .description(N_("A point of the curve, chosen by the sort index"));
+  b.add_output<decl::Int>(N_("Total"))
+      .dependent_field()
+      .description(N_("The number of points in the curve"));
 }
 
 class PointsOfCurveInput final : public bke::CurvesFieldInput {
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc
index cf35f9dbdc5..94bca02640b 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc
@@ -21,12 +21,12 @@ static void node_declare(NodeDeclarationBuilder &b)
       .min(0)
       .supports_field()
       .description(N_("Which of the sorted corners to output"));
-  b.add_output<decl::Int>(N_("Total"))
-      .dependent_field()
-      .description(N_("The number of corners in the face"));
   b.add_output<decl::Int>(N_("Corner Index"))
       .dependent_field()
       .description(N_("A corner of the face, chosen by the sort index"));
+  b.add_output<decl::Int>(N_("Total"))
+      .dependent_field()
+      .description(N_("The number of corners in the face"));
 }
 
 class CornersOfFaceInput final : public bke::MeshFieldInput {
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
index 9c3d3819a7c..7c80e9fdf67 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
@@ -24,12 +24,12 @@ static void node_declare(NodeDeclarationBuilder &b)
       .min(0)
       .supports_field()
       .description(N_("Which of the sorted corners to output"));
-  b.add_output<decl::Int>(N_("Total"))
-      .dependent_field()
-      .description(N_("The number of faces or corners connected to each vertex"));
   b.add_output<decl::Int>(N_("Corner Index"))
       .dependent_field()
       .description(N_("A corner connected to the face, chosen by the sort index"));
+  b.add_output<decl::Int>(N_("Total"))
+      .dependent_field()
+      .description(N_("The number of faces or corners connected to each vertex"));
 }
 
 static void convert_span(const Span<int> src, MutableSpan<int64_t> dst)
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
index 11b41ac5605..d099cd7f8cc 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
@@ -24,12 +24,12 @@ static void node_declare(NodeDeclarationBuilder &b)
       .min(0)
       .supports_field()
       .description(N_("Which of the sorted edges to output"));
-  b.add_output<decl::Int>(N_("Total"))
-      .dependent_field()
-      .description(N_("The number of edges connected to each vertex"));
   b.add_output<decl::Int>(N_("Edge Index"))
       .dependent_field()
       .description(N_("An edge connected to the face, chosen by the sort index"));
+  b.add_output<decl::Int>(N_("Total"))
+      .dependent_field()
+      .description(N_("The number of edges connected to each vertex"));
 }
 
 static void convert_span(const Span<int> src, MutableSpan<int64_t> dst)
-- 
cgit v1.2.3