[Bf-blender-cvs] [75849c77962] blender-v3.4-release: Fix: ignore unavailable sockets linked to multi-input socket

Iliya Katueshenock noreply at git.blender.org
Mon Dec 19 10:30:07 CET 2022


Commit: 75849c77962ebb26fdca9085f38fdf6711b35b97
Author: Iliya Katueshenock
Date:   Thu Dec 15 19:32:30 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB75849c77962ebb26fdca9085f38fdf6711b35b97

Fix: ignore unavailable sockets linked to multi-input socket

Differential Revision: https://developer.blender.org/D16784

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

M	source/blender/nodes/intern/geometry_nodes_lazy_function.cc

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

diff --git a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc
index 367c66f99b6..d09708acb9a 100644
--- a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc
+++ b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc
@@ -1156,10 +1156,11 @@ struct GeometryNodesLazyFunctionGraphBuilder {
             if (multi_input_link == link) {
               break;
             }
-            if (!(multi_input_link->is_muted() ||
-                  nodeIsDanglingReroute(&btree_, multi_input_link->fromnode))) {
-              link_index++;
+            if (multi_input_link->is_muted() || !multi_input_link->fromsock->is_available() ||
+                nodeIsDanglingReroute(&btree_, multi_input_link->fromnode)) {
+              continue;
             }
+            link_index++;
           }
           if (to_bsocket.owner_node().is_muted()) {
             if (link_index == 0) {



More information about the Bf-blender-cvs mailing list