From 4251455dcd739bb54c4dda8d9fd64460660e5b5f Mon Sep 17 00:00:00 2001 From: Johnny Matthews Date: Fri, 21 Jan 2022 09:01:18 -0600 Subject: 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 --- source/blender/blenloader/intern/versioning_300.c | 2 ++ source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) 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(N_("Index")) + b.add_output(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 field{std::make_shared()}; - params.set_output("Index", std::move(field)); + params.set_output("Island Index", std::move(field)); } if (params.output_is_required("Island Count")) { Field field{std::make_shared()}; -- cgit v1.2.3