blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Hans Goudey 2021-04-27 23:38:49 -05:00
parent 581f79e734 7e678c3096
commit 1b6f655abe
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
View File

@ -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]);
}
}
}