diff options
author | Dalai Felinto <dalai@blender.org> | 2021-01-29 00:59:18 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2021-01-29 00:59:18 +0300 |
commit | 323b7ad9cd447d57f2e33aae937fb3265b9f5475 (patch) | |
tree | 2e9d2935ff485149e0a83175e3397d839a99fa27 /source/blender/nodes | |
parent | 7a62574338c3ddc8c83fcbf7f38cef4ec54bc5b8 (diff) | |
parent | 2f60e5d1b56dfb8c9104f4652e5cfa5914e58bd7 (diff) |
Merge remote-tracking branch 'origin/blender-v2.92-release'
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc | 3 |
1 files changed, 3 insertions, 0 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 7549305aedb..384094b6d8c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc @@ -163,6 +163,9 @@ static void fill_new_attribute(Span<const GeometryComponent *> src_components, int offset = 0; for (const GeometryComponent *component : src_components) { const int domain_size = component->attribute_domain_size(domain); + if (domain_size == 0) { + continue; + } ReadAttributePtr read_attribute = component->attribute_get_for_read( attribute_name, domain, data_type, nullptr); |