diff options
author | Jacques Lucke <jacques@blender.org> | 2022-02-09 17:54:41 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2022-02-09 17:54:41 +0300 |
commit | e098a296068a444b3cc82be72cb0af919227888a (patch) | |
tree | 540e1264f5fcc3d9112355908e459e2caf32ef48 /source/blender/modifiers | |
parent | 669d3bbad657e3b0003e5c56354b047cd6e6caba (diff) | |
parent | 7313a84c5acb401817f1c44cfd8bf22428f34424 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_nodes.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index ca4bfbed5f5..f16fc8ff764 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -1031,7 +1031,11 @@ static void store_computed_output_attributes( { for (const OutputAttributeToStore &store : attributes_to_store) { GeometryComponent &component = geometry.get_component_for_write(store.component_type); - if (component.attribute_exists(store.name)) { + const CustomDataType data_type = blender::bke::cpp_type_to_custom_data_type(store.data.type()); + const std::optional<AttributeMetaData> meta_data = component.attribute_get_meta_data( + store.name); + if (meta_data.has_value() && meta_data->domain == store.domain && + meta_data->data_type == data_type) { /* Copy the data into an existing attribute. */ blender::bke::WriteAttributeLookup write_attribute = component.attribute_try_get_for_write( store.name); @@ -1045,6 +1049,10 @@ static void store_computed_output_attributes( MEM_freeN(store.data.data()); } else { + /* Replace the existing attribute with the new data. */ + if (meta_data.has_value()) { + component.attribute_try_delete(store.name); + } component.attribute_try_create(store.name, store.domain, blender::bke::cpp_type_to_custom_data_type(store.data.type()), |