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 | 5 |
1 files changed, 3 insertions, 2 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 ca2e1be6e6f..4fec14ec9c9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc @@ -147,16 +147,17 @@ static void determine_final_data_type_and_domain(Span<const GeometryComponent *> AttributeDomain *r_domain) { Vector<CustomDataType> data_types; + Vector<AttributeDomain> domains; for (const GeometryComponent *component : components) { ReadAttributePtr attribute = component->attribute_try_get_for_read(attribute_name); if (attribute) { data_types.append(attribute->custom_data_type()); - /* TODO: Use highest priority domain. */ - *r_domain = attribute->domain(); + domains.append(attribute->domain()); } } *r_type = attribute_data_type_highest_complexity(data_types); + *r_domain = attribute_domain_highest_priority(domains); } static void fill_new_attribute(Span<const GeometryComponent *> src_components, |