[Bf-blender-cvs] [393879f30cc] blender-v3.0-release: Fix: wrong field inferencing with unavailable sockets
Jacques Lucke
noreply at git.blender.org
Thu Nov 11 18:27:08 CET 2021
Commit: 393879f30cc093a826f693a903155f95bcbfd34c
Author: Jacques Lucke
Date: Thu Nov 11 18:26:40 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB393879f30cc093a826f693a903155f95bcbfd34c
Fix: wrong field inferencing with unavailable sockets
===================================================================
M source/blender/blenkernel/intern/node.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 0827a15dea0..cc8eadef149 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4722,6 +4722,9 @@ static OutputFieldDependency find_group_output_dependencies(
/* Propagate search further to the left. */
for (const InputSocketRef *origin_input_socket :
gather_input_socket_dependencies(field_dependency, origin_node)) {
+ if (!origin_input_socket->is_available()) {
+ continue;
+ }
if (!field_state_by_socket_id[origin_input_socket->id()].is_single) {
if (handled_sockets.add(origin_input_socket)) {
sockets_to_check.push(origin_input_socket);
@@ -4770,6 +4773,9 @@ static void propagate_data_requirements_from_right_to_left(
const Vector<const InputSocketRef *> connected_inputs = gather_input_socket_dependencies(
field_dependency, *node);
for (const InputSocketRef *input_socket : connected_inputs) {
+ if (!input_socket->is_available()) {
+ continue;
+ }
if (inferencing_interface.inputs[input_socket->index()] ==
InputSocketFieldType::Implicit) {
if (!input_socket->is_logically_linked()) {
More information about the Bf-blender-cvs
mailing list