blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix T95612: only overwrite existing attributes with matching domain and type 

Also fixes T95611 and T95610.

Differential Revision: https://developer.blender.org/D14051
This commit is contained in:
Jacques Lucke 2022-02-09 15:50:03 +01:00
parent d74bb7be19
commit 7313a84c5a
Notes: blender-bot 2023-10-13 01:54:23 +02:00 
Referenced by issue #95610, Writing to an attribute that is also a vertexgroup results in black when used in a shader
Referenced by issue #95611, Regression: Capture Attribute in Face Corner mode produces garbage data
Referenced by issue #95612, Realize Instances crashes Blender (3.1, 3.2 is fine)
Referenced by issue #95614, Converting to mesh or applying GN modifier destroys UVMap face corner attribute if GN references external object with UVMap of the same name
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/modifiers/intern/MOD_nodes.cc
View File

@ -996,7 +996,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);
@ -1010,6 +1014,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()),