blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fix (unreported): unlinked group input is not logged in geometry nodes 

Differential Revision: https://developer.blender.org/D13340
This commit is contained in:
Jacques Lucke 2021-11-23 19:03:01 +01:00
parent 9e5aae4215
commit 3844e9dbe7
Notes: blender-bot 2024-03-25 12:30:38 +01:00 
Referenced by issue #93323, Tablet Pressure not working in New Window
Referenced by issue #93310, Compositor: Crash due to broken image paths
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/modifiers/intern/MOD_nodes_evaluator.cc
View File

@ -1398,6 +1398,14 @@ class GeometryNodesEvaluator {
});
}
/**
* Loads the value of a socket that is not computed by another node. Note that the socket may
* still be linked to e.g. a Group Input node, but the socket on the outside is not connected to
* anything.
*
* \param input_socket The socket of the node that wants to use the value.
* \param origin_socket The socket that we want to load the value from.
*/
void load_unlinked_input_value(LockedNode &locked_node,
const DInputSocket input_socket,
InputState &input_state,
@ -1417,7 +1425,15 @@ class GeometryNodesEvaluator {
else {
SingleInputValue &single_value = *input_state.value.single;
single_value.value = value.get();
this->log_socket_value({input_socket}, value);
Vector<DSocket> sockets_to_log_to = {input_socket};
if (origin_socket != input_socket) {
/* This might log the socket value for the #origin_socket more than once, but this is
* handled by the logging system gracefully. */
sockets_to_log_to.append(origin_socket);
}
/* TODO: Log to the intermediate sockets between the group input and where the value is
* actually used as well. */
this->log_socket_value(sockets_to_log_to, value);
}
}