Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-04-28 07:37:27 +0300
committerHans Goudey <h.goudey@me.com>2021-04-28 07:37:27 +0300
commit7e678c30964c4c0d9d2c020f25e8ac717211c208 (patch)
treea7c28f4af1603213fa9ff824d6b49a8a8e925971 /source
parent28828e0041f8d292723796bc3787bd1b3d372a95 (diff)
Fix T87165: Join geometry node doesn't copy instance IDs
This makes motion blur work incorrectly. With a similar fix to rBf2d70c02f88cc00, just copy over the instance IDs in this case.
Diffstat (limited to 'source')
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc3
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 52512769a47..77d2b0df2a9 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
@@ -248,8 +248,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]);
}
}
}