[Bf-blender-cvs] [b43bdd8ba28] master: Fix T102751: missing tree update with muted nodes
Jacques Lucke
noreply at git.blender.org
Sat Nov 26 13:46:49 CET 2022
Commit: b43bdd8ba28cdad11d10e0028beeb210ebe083a9
Author: Jacques Lucke
Date: Sat Nov 26 13:46:39 2022 +0100
Branches: master
https://developer.blender.org/rBb43bdd8ba28cdad11d10e0028beeb210ebe083a9
Fix T102751: missing tree update with muted nodes
This was accidentally caused by removing too much code in
{rBb4c3ea264439158df70e837e20f8dd9ec548de2d}.
===================================================================
M source/blender/blenkernel/intern/node_runtime.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/node_runtime.cc b/source/blender/blenkernel/intern/node_runtime.cc
index 61f0bab9fef..d5f1136ca48 100644
--- a/source/blender/blenkernel/intern/node_runtime.cc
+++ b/source/blender/blenkernel/intern/node_runtime.cc
@@ -96,6 +96,19 @@ static void update_socket_vectors_and_owner_node(const bNodeTree &ntree)
}
}
+static void update_internal_link_inputs(const bNodeTree &ntree)
+{
+ bNodeTreeRuntime &tree_runtime = *ntree.runtime;
+ for (bNode *node : tree_runtime.nodes) {
+ for (bNodeSocket *socket : node->runtime->outputs) {
+ socket->runtime->internal_link_input = nullptr;
+ }
+ for (bNodeLink *link : node->runtime->internal_links) {
+ link->tosock->runtime->internal_link_input = link->fromsock;
+ }
+ }
+}
+
static void update_directly_linked_links_and_sockets(const bNodeTree &ntree)
{
bNodeTreeRuntime &tree_runtime = *ntree.runtime;
@@ -416,6 +429,7 @@ static void ensure_topology_cache(const bNodeTree &ntree)
update_node_vector(ntree);
update_link_vector(ntree);
update_socket_vectors_and_owner_node(ntree);
+ update_internal_link_inputs(ntree);
update_directly_linked_links_and_sockets(ntree);
threading::parallel_invoke(
tree_runtime.nodes.size() > 32,
More information about the Bf-blender-cvs
mailing list