[Bf-blender-cvs] [b44a500988f] master: Fix T93920: Wrong field inferencing state with unavailable socket

Hans Goudey noreply at git.blender.org
Tue Dec 14 15:30:53 CET 2021


Commit: b44a500988f3d6aea631d17ca383c8ced55e4371
Author: Hans Goudey
Date:   Tue Dec 14 08:30:45 2021 -0600
Branches: master
https://developer.blender.org/rBb44a500988f3d6aea631d17ca383c8ced55e4371

Fix T93920: Wrong field inferencing state with unavailable socket

This commit ignores unavailable sockets in one more place, to fix the
case in T93920.

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

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

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

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index a78917ab0a3..a4de6730f8f 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4748,7 +4748,9 @@ static void propagate_data_requirements_from_right_to_left(
       /* The output is required to be a single value when it is connected to any input that does
        * not support fields. */
       for (const InputSocketRef *target_socket : output_socket->directly_linked_sockets()) {
-        state.requires_single |= field_state_by_socket_id[target_socket->id()].requires_single;
+        if (target_socket->is_available()) {
+          state.requires_single |= field_state_by_socket_id[target_socket->id()].requires_single;
+        }
       }
 
       if (state.requires_single) {



More information about the Bf-blender-cvs mailing list