Merge branch 'master' into geometry-nodes-unnamed-attributesgeometry-nodes-unnamed-attributes

1 files changed, 10 insertions, 3 deletions

diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.hh b/source/blender/modifiers/intern/MOD_nodes_evaluator.hh
index 84249e4244e..f4ee6242dcb 100644
--- a/source/blender/modifiers/intern/MOD_nodes_evaluator.hh
+++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.hh
@@ -19,30 +19,37 @@
 #include "BLI_map.hh"
 
 #include "NOD_derived_node_tree.hh"
+#include "NOD_geometry_nodes_eval_log.hh"
 #include "NOD_node_tree_multi_function.hh"
 
 #include "FN_generic_pointer.hh"
 
 #include "DNA_modifier_types.h"
 
+namespace geo_log = blender::nodes::geometry_nodes_eval_log;
+
 namespace blender::modifiers::geometry_nodes {
 
 using namespace nodes::derived_node_tree_types;
 using fn::GMutablePointer;
 using fn::GPointer;
 
-using LogSocketValueFn = std::function<void(DSocket, Span<GPointer>)>;
-
 struct GeometryNodesEvaluationParams {
   blender::LinearAllocator<> allocator;
 
   Map<DOutputSocket, GMutablePointer> input_values;
   Vector<DInputSocket> output_sockets;
+  /* These sockets will be computed but are not part of the output. Their value can be retrieved in
+   * `log_socket_value_fn`. These sockets are not part of `output_sockets` because then the
+   * evaluator would have to keep the socket values in memory until the end, which might not be
+   * necessary in all cases. Sometimes `log_socket_value_fn` might just want to look at the value
+   * and then it can be freed. */
+  Vector<DSocket> force_compute_sockets;
   nodes::MultiFunctionByNode *mf_by_node;
   const NodesModifierData *modifier_;
   Depsgraph *depsgraph;
   Object *self_object;
-  LogSocketValueFn log_socket_value_fn;
+  geo_log::GeoLogger *geo_logger;
 
   Vector<GMutablePointer> r_output_values;
 };