diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-11 18:59:43 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-11 18:59:43 +0300 |
commit | 06401157a69f769388c533979b0558ac599d792e (patch) | |
tree | 9bcd5b36b45e8725fb769dbb2ba79ec1acacd111 | |
parent | 46b79b3d4a8a6f684f2879f82c0123b8d972d6e2 (diff) |
Fix: incorrect attribute type in network
-rw-r--r-- | source/blender/blenkernel/intern/simulation.cc | 2 | ||||
-rw-r--r-- | source/blender/functions/intern/multi_function_network.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/simulation.cc b/source/blender/blenkernel/intern/simulation.cc index 35ef664dce3..cce324d49ee 100644 --- a/source/blender/blenkernel/intern/simulation.cc +++ b/source/blender/blenkernel/intern/simulation.cc @@ -247,7 +247,7 @@ static AttributeNodeMap deduplicate_attribute_nodes(fn::MFNetwork &network, attribute_nodes_by_name_and_type; for (uint i : IndexRange(amount)) { attribute_nodes_by_name_and_type - .lookup_or_add_default({attribute_names[i], name_sockets[i]->data_type()}) + .lookup_or_add_default({attribute_names[i], name_sockets[i]->node().output(0).data_type()}) .append(&name_sockets[i]->node()); } diff --git a/source/blender/functions/intern/multi_function_network.cc b/source/blender/functions/intern/multi_function_network.cc index 47e3bf4d0b5..11c9c065f51 100644 --- a/source/blender/functions/intern/multi_function_network.cc +++ b/source/blender/functions/intern/multi_function_network.cc @@ -197,6 +197,7 @@ MFInputSocket &MFNetwork::add_output(StringRef name, MFDataType data_type) void MFNetwork::relink(MFOutputSocket &old_output, MFOutputSocket &new_output) { BLI_assert(&old_output != &new_output); + BLI_assert(old_output.data_type_ == new_output.data_type_); for (MFInputSocket *input : old_output.targets()) { input->origin_ = &new_output; } |