[Bf-blender-cvs] [4968a0bdf9e] master: Fix T89122: crash when multi input is connected to multiple group inputs

Jacques Lucke noreply at git.blender.org
Mon Jun 21 12:15:44 CEST 2021


Commit: 4968a0bdf9ec16134a545678eabb922f04ed8315
Author: Jacques Lucke
Date:   Mon Jun 21 12:15:32 2021 +0200
Branches: master
https://developer.blender.org/rB4968a0bdf9ec16134a545678eabb922f04ed8315

Fix T89122: crash when multi input is connected to multiple group inputs

The early `return` was wrong when there are multiple origin sockets
that need to be loaded.

===================================================================

M	source/blender/modifiers/intern/MOD_nodes_evaluator.cc

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
index 01eebfea333..e8677c7ce1a 100644
--- a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
+++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
@@ -1041,13 +1041,14 @@ class GeometryNodesEvaluator {
         this->load_unlinked_input_value(locked_node, input_socket, input_state, origin_socket);
         locked_node.node_state.missing_required_inputs -= 1;
         this->schedule_node(locked_node);
-        return;
       }
-      /* The value has not been computed yet, so when it will be forwarded by another node, this
-       * node will be triggered. */
-      will_be_triggered_by_other_node = true;
+      else {
+        /* The value has not been computed yet, so when it will be forwarded by another node, this
+         * node will be triggered. */
+        will_be_triggered_by_other_node = true;
 
-      locked_node.delayed_required_outputs.append(DOutputSocket(origin_socket));
+        locked_node.delayed_required_outputs.append(DOutputSocket(origin_socket));
+      }
     }
     /* If this node will be triggered by another node, we don't have to schedule it now. */
     if (!will_be_triggered_by_other_node) {



More information about the Bf-blender-cvs mailing list