[Bf-blender-cvs] [0116cc1f4d8] functions: fix

Jacques Lucke noreply at git.blender.org
Mon Jan 27 22:10:11 CET 2020


Commit: 0116cc1f4d85d7512b3d9e0550b03da0beb47259
Author: Jacques Lucke
Date:   Sun Jan 26 20:54:09 2020 +0100
Branches: functions
https://developer.blender.org/rB0116cc1f4d85d7512b3d9e0550b03da0beb47259

fix

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

M	source/blender/functions/intern/multi_functions/network.cc

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

diff --git a/source/blender/functions/intern/multi_functions/network.cc b/source/blender/functions/intern/multi_functions/network.cc
index 11ab9d67348..b74745c59d4 100644
--- a/source/blender/functions/intern/multi_functions/network.cc
+++ b/source/blender/functions/intern/multi_functions/network.cc
@@ -409,11 +409,12 @@ BLI_NOINLINE void MF_EvaluateNetwork::evaluate_network_to_compute_outputs(
     const MFOutputSocket &socket = *sockets_to_compute.peek();
     const MFNode &node = socket.node();
 
-    if (node.is_dummy()) {
-      BLI_assert(m_inputs.contains(&socket));
+    if (storage.socket_is_computed(socket)) {
+      sockets_to_compute.pop();
       continue;
     }
 
+    BLI_assert(node.is_function());
     const MFFunctionNode &function_node = node.as_function();
 
     ScopedVector<const MFOutputSocket *> missing_sockets;



More information about the Bf-blender-cvs mailing list