[Bf-blender-cvs] [4682aad4323] master: Fix: Field type inference considers unavailable sockets

Hans Goudey noreply at git.blender.org
Fri Oct 15 20:54:15 CEST 2021


Commit: 4682aad43236a70be1d3c591b7cd73d79d9e2035
Author: Hans Goudey
Date:   Fri Oct 15 13:54:08 2021 -0500
Branches: master
https://developer.blender.org/rB4682aad43236a70be1d3c591b7cd73d79d9e2035

Fix: Field type inference considers unavailable sockets

If a node had unused/unavailable inputs, they were still considered
when deciding whether the output is a field or not.

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

M	source/blender/blenkernel/intern/node.cc

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index e526475fa95..dedf65c7f64 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4858,6 +4858,9 @@ static void propagate_field_status_from_left_to_right(
         case OutputSocketFieldType::DependentField: {
           for (const InputSocketRef *input_socket :
                gather_input_socket_dependencies(field_dependency, *node)) {
+            if (!input_socket->is_available()) {
+              continue;
+            }
             if (!field_state_by_socket_id[input_socket->id()].is_single) {
               state.is_single = false;
               break;



More information about the Bf-blender-cvs mailing list