diff options
author | Jacques Lucke <jacques@blender.org> | 2021-06-24 16:45:43 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-06-24 16:45:43 +0300 |
commit | a13314a03f929d30d6db174541abb10daa501117 (patch) | |
tree | a0457ec3bdbe86d31c498175f990e0f29b493e27 /source/blender/modifiers | |
parent | cbdddc564887731d9b4fe4432fdf855975e8e939 (diff) |
Fix T89390: crash when join geometry node has only muted inputs
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_nodes_evaluator.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc index e8677c7ce1a..980607db839 100644 --- a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc +++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc @@ -1456,9 +1456,11 @@ Vector<GMutablePointer> NodeParamsProvider::extract_multi_input(StringRef identi Vector<GMutablePointer> ret_values; socket.foreach_origin_socket([&](DSocket origin) { - for (const MultiInputValueItem &item : multi_value.items) { - if (item.origin == origin) { + for (MultiInputValueItem &item : multi_value.items) { + if (item.origin == origin && item.value != nullptr) { ret_values.append({*input_state.type, item.value}); + /* Make sure we do not use the same value again if two values have the same origin. */ + item.value = nullptr; return; } } |