diff options
author | Hans Goudey <h.goudey@me.com> | 2022-01-15 01:42:04 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-01-15 01:42:04 +0300 |
commit | 6a16a9e661f134be3f2be1725c25de9d191ce7ba (patch) | |
tree | 40839357947de54c93b938490237d381e8d1ecac | |
parent | 6e926e9b567eb51124b5ca92099fb1424676e77f (diff) |
Geometry Nodes: Rename transfer attribute geometry input
Conceptually, this is the geometry that data is taken from,
not the target of an operation, so rename it from "Target"
to "Source". This was common user feedback and agreed
on in a recent sub-module meeting.
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 3 | ||||
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index a80be65bd75..f36285c9ecf 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -2544,11 +2544,12 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - /* Rename socket on "String to Curves"-node. */ + /* Rename geometry socket on "String to Curves" node and "Transfer Attribute" node. */ 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"); + version_node_input_socket_name(ntree, GEO_NODE_TRANSFER_ATTRIBUTE, "Target", "Source"); } } } diff --git a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc index 6867051ecfe..5a8d9ab470d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc @@ -44,7 +44,7 @@ NODE_STORAGE_FUNCS(NodeGeometryTransferAttribute) static void node_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>(N_("Target")) + b.add_input<decl::Geometry>(N_("Source")) .supported_type({GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD, GEO_COMPONENT_TYPE_CURVE, @@ -749,7 +749,7 @@ static void output_attribute_field(GeoNodeExecParams ¶ms, GField field) static void node_geo_exec(GeoNodeExecParams params) { - GeometrySet geometry = params.extract_input<GeometrySet>("Target"); + GeometrySet geometry = params.extract_input<GeometrySet>("Source"); const NodeGeometryTransferAttribute &storage = node_storage(params.node()); const GeometryNodeAttributeTransferMode mapping = (GeometryNodeAttributeTransferMode) storage.mode; |