diff options
Diffstat (limited to 'source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc')
| -rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc index b628c5cbab8..cd385f364e9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc @@ -33,8 +33,8 @@ namespace blender::nodes { static void geo_node_join_geometry_declare(NodeDeclarationBuilder &b) { - b.add_input<decl::Geometry>("Geometry").multi_input(); - b.add_output<decl::Geometry>("Geometry"); + b.add_input<decl::Geometry>(N_("Geometry")).multi_input(); + b.add_output<decl::Geometry>(N_("Geometry")); } static Mesh *join_mesh_topology_and_builtin_attributes(Span<const MeshComponent *> src_components) @@ -270,17 +270,16 @@ static void join_components(Span<const InstancesComponent *> src_components, Geo } Span<float4x4> src_transforms = src_component->instance_transforms(); - Span<int> src_ids = src_component->instance_ids(); Span<int> src_reference_handles = src_component->instance_reference_handles(); for (const int i : src_transforms.index_range()) { const int src_handle = src_reference_handles[i]; const int dst_handle = handle_map[src_handle]; const float4x4 &transform = src_transforms[i]; - const int id = src_ids[i]; - dst_component.add_instance(dst_handle, transform, id); + dst_component.add_instance(dst_handle, transform); } } + join_attributes(to_base_components(src_components), dst_component, {"position"}); } static void join_components(Span<const VolumeComponent *> src_components, GeometrySet &result) |