[Bf-blender-cvs] [e4de2df5de9] temp-geometry-nodes-text: Rename socket "Curves" to "Curve Instances" on String to Curves-node

[Erik]

Commit: e4de2df5de9bc9daf8b4776d0efd96439f7a09be
Author: Erik
Date:   Fri Oct 29 00:00:03 2021 +0200
Branches: temp-geometry-nodes-text
https://developer.blender.org/rBe4de2df5de9bc9daf8b4776d0efd96439f7a09be

Rename socket "Curves" to "Curve Instances" on String to Curves-node

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

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

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

diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 68faa4c0672..826560562c3 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -2154,6 +2154,12 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
    * \note Keep this message at the bottom of the function.
    */
   {
+    LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
+      if (ntree->type == NTREE_GEOMETRY) {
+        version_node_output_socket_name(
+            ntree, GEO_NODE_STRING_TO_CURVES, "Curves", "Curve Instances");
+      }
+    }
     /* Keep this block, even when empty. */
   }
 }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
index e3301e36279..9be1cfc6c71 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
@@ -44,7 +44,7 @@ static void geo_node_string_to_curves_declare(NodeDeclarationBuilder &b)
   b.add_input<decl::Float>("Line Spacing").default_value(1.0f).min(0.0f).subtype(PROP_DISTANCE);
   b.add_input<decl::Float>("Text Box Width").default_value(0.0f).min(0.0f).subtype(PROP_DISTANCE);
   b.add_input<decl::Float>("Text Box Height").default_value(0.0f).min(0.0f).subtype(PROP_DISTANCE);
-  b.add_output<decl::Geometry>("Curves");
+  b.add_output<decl::Geometry>("Curve Instances");
   b.add_output<decl::String>("Remainder");
   b.add_output<decl::Int>("Line").field_source();
   b.add_output<decl::Vector>("Pivot Point").field_source();
@@ -391,7 +391,7 @@ static void geo_node_string_to_curves_exec(GeoNodeExecParams params)
   }
 
   if (layout.positions.size() == 0) {
-    params.set_output("Curves", GeometrySet());
+    params.set_output("Curve Instances", GeometrySet());
     return;
   }
 
@@ -402,7 +402,7 @@ static void geo_node_string_to_curves_exec(GeoNodeExecParams params)
   add_instances_from_handles(instances, char_handles, layout);
   create_attributes(params, layout, instances);
 
-  params.set_output("Curves", std::move(geometry_set_out));
+  params.set_output("Curve Instances", std::move(geometry_set_out));
 }
 
 }  // namespace blender::nodes