diff options
author | Hans Goudey <h.goudey@me.com> | 2021-04-28 07:38:49 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-04-28 07:38:49 +0300 |
commit | 1b6f655abe2cb844a089a20a97667edb72ded055 (patch) | |
tree | e288e9f65f16dffde1c289c49a0860b59de5e36b | |
parent | 581f79e7344e30ef23fca195e8adea2d70eae618 (diff) | |
parent | 7e678c30964c4c0d9d2c020f25e8ac717211c208 (diff) |
Merge branch 'blender-v2.93-release'
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc | 3 |
1 files changed, 2 insertions, 1 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 857b60dfb93..6696e2ccee8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc @@ -246,8 +246,9 @@ static void join_components(Span<const InstancesComponent *> src_components, Geo const int size = component->instances_amount(); Span<InstancedData> instanced_data = component->instanced_data(); Span<float4x4> transforms = component->transforms(); + Span<int> ids = component->ids(); for (const int i : IndexRange(size)) { - dst_component.add_instance(instanced_data[i], transforms[i]); + dst_component.add_instance(instanced_data[i], transforms[i], ids[i]); } } } |