[Bf-blender-cvs] [4251455dcd7] master: Geometry Nodes: Mesh Island Node - Rename Index Socket

[Johnny Matthews]

Commit: 4251455dcd739bb54c4dda8d9fd64460660e5b5f
Author: Johnny Matthews
Date:   Fri Jan 21 09:01:18 2022 -0600
Branches: master
https://developer.blender.org/rB4251455dcd739bb54c4dda8d9fd64460660e5b5f

Geometry Nodes: Mesh Island Node - Rename Index Socket

Rename 'Index' Socket to 'Island Index' to make it more consistent with
'Island Count'

Differential Revision: https://developer.blender.org/D13893

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

M	source/blender/blenloader/intern/versioning_300.c
M	source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc

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

diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 78ec2276af7..81fc6086951 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -2551,6 +2551,8 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
             ntree, GEO_NODE_STRING_TO_CURVES, "Curves", "Curve Instances");
         version_node_output_socket_name(
             ntree, GEO_NODE_INPUT_MESH_EDGE_ANGLE, "Angle", "Unsigned Angle");
+        version_node_output_socket_name(
+            ntree, GEO_NODE_INPUT_MESH_ISLAND, "Index", "Island Index");
         version_node_input_socket_name(ntree, GEO_NODE_TRANSFER_ATTRIBUTE, "Target", "Source");
       }
     }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc
index ba4295017bc..68bb93bbb64 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc
@@ -27,7 +27,7 @@ namespace blender::nodes::node_geo_input_mesh_island_cc {
 
 static void node_declare(NodeDeclarationBuilder &b)
 {
-  b.add_output<decl::Int>(N_("Index"))
+  b.add_output<decl::Int>(N_("Island Index"))
       .field_source()
       .description(N_("Island indices are based on the order of the lowest-numbered vertex "
                       "contained in each island"));
@@ -133,9 +133,9 @@ class IslandCountFieldInput final : public GeometryFieldInput {
 
 static void node_geo_exec(GeoNodeExecParams params)
 {
-  if (params.output_is_required("Index")) {
+  if (params.output_is_required("Island Index")) {
     Field<int> field{std::make_shared<IslandFieldInput>()};
-    params.set_output("Index", std::move(field));
+    params.set_output("Island Index", std::move(field));
   }
   if (params.output_is_required("Island Count")) {
     Field<int> field{std::make_shared<IslandCountFieldInput>()};