diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-04-22 17:20:03 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-04-22 17:20:03 +0300 |
| commit | d1ccc5b9694b7c737158f4d4bd83ae780b32d258 (patch) | |
| tree | 18a8e6bef4dac90c72fc3337b84222b322b519bc /source/blender/blenkernel/intern/geometry_set_instances.cc | |
| parent | 9fccbe2d1385df6dfbd3291d2b8950732e028f25 (diff) | |
Geometry Nodes: Add initializer for attribute creation
Previously we always had to set attribute values after creating
the attribute. This patch adds an initializer argument to
`attribute_try_create` which can fill it in a few ways, which
are explained in code comments.
This fixes T87597.
Differential Revision: https://developer.blender.org/D11045
Diffstat (limited to 'source/blender/blenkernel/intern/geometry_set_instances.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/geometry_set_instances.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/geometry_set_instances.cc b/source/blender/blenkernel/intern/geometry_set_instances.cc index 2e9f6daabad..47db5d1f901 100644 --- a/source/blender/blenkernel/intern/geometry_set_instances.cc +++ b/source/blender/blenkernel/intern/geometry_set_instances.cc @@ -449,7 +449,8 @@ static void join_attributes(Span<GeometryInstanceGroup> set_groups, const CPPType *cpp_type = bke::custom_data_type_to_cpp_type(data_type_output); BLI_assert(cpp_type != nullptr); - result.attribute_try_create(entry.key, domain_output, data_type_output); + result.attribute_try_create( + entry.key, domain_output, data_type_output, AttributeInitDefault()); WriteAttributeLookup write_attribute = result.attribute_try_get_for_write(name); if (!write_attribute || &write_attribute.varray->type() != cpp_type || write_attribute.domain != domain_output) { |