[Bf-blender-cvs] [9fa4ceb3409] master: Geometry Nodes: Change Collection Info output socket name to Instances

[Iliya Katueshenock]

Commit: 9fa4ceb34095fed176208a01742122c40a86ecb1
Author: Iliya Katueshenock
Date:   Sat Nov 26 18:11:01 2022 -0600
Branches: master
https://developer.blender.org/rB9fa4ceb34095fed176208a01742122c40a86ecb1

Geometry Nodes: Change Collection Info output socket name to Instances

As described in T101948, this commit changes socket name to be more
consistent with other nodes that generate instances output.

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

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

M	source/blender/blenloader/intern/versioning_300.cc
M	source/blender/nodes/geometry/nodes/node_geo_collection_info.cc

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

diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc
index 5a54a517620..c0c65cb18b0 100644
--- a/source/blender/blenloader/intern/versioning_300.cc
+++ b/source/blender/blenloader/intern/versioning_300.cc
@@ -3729,5 +3729,11 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
    */
   {
     /* Keep this block, even when empty. */
+
+    LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
+      if (ntree->type == NTREE_GEOMETRY) {
+        version_node_socket_name(ntree, GEO_NODE_COLLECTION_INFO, "Geometry", "Instances");
+      }
+    }
   }
 }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
index 6c41dbbe34c..a9742ddeac2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
@@ -28,7 +28,7 @@ static void node_declare(NodeDeclarationBuilder &b)
       .description(
           N_("Reset the transforms of every child instance in the output. Only used when Separate "
              "Children is enabled"));
-  b.add_output<decl::Geometry>(N_("Geometry"));
+  b.add_output<decl::Geometry>(N_("Instances"));
 }
 
 static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
@@ -137,7 +137,7 @@ static void node_geo_exec(GeoNodeExecParams params)
     instances->add_instance(handle, transform);
   }
 
-  params.set_output("Geometry", GeometrySet::create_with_instances(instances.release()));
+  params.set_output("Instances", GeometrySet::create_with_instances(instances.release()));
 }
 
 }  // namespace blender::nodes::node_geo_collection_info_cc