[Bf-blender-cvs] [98b50057879] temp-geometry-nodes-evaluator-refactor: fix

[Jacques Lucke]

Commit: 98b50057879de2e9930ad22ac235f537fa0b112a
Author: Jacques Lucke
Date:   Mon Jul 18 22:33:07 2022 +0200
Branches: temp-geometry-nodes-evaluator-refactor
https://developer.blender.org/rB98b50057879de2e9930ad22ac235f537fa0b112a

fix

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

M	source/blender/nodes/intern/geometry_nodes_log.cc
M	source/blender/nodes/intern/geometry_nodes_to_lazy_function_graph.cc

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

diff --git a/source/blender/nodes/intern/geometry_nodes_log.cc b/source/blender/nodes/intern/geometry_nodes_log.cc
index ffc87e6b966..b9206cf93e8 100644
--- a/source/blender/nodes/intern/geometry_nodes_log.cc
+++ b/source/blender/nodes/intern/geometry_nodes_log.cc
@@ -43,6 +43,17 @@ void GeoTreeLog::ensure_node_run_time()
       this->nodes.lookup_or_add_default_as(node_name).run_time += duration;
       this->run_time_sum += duration;
     }
+    for (const ContextStackHash &child_hash : tree_logger->children_hashes) {
+      GeoTreeLog &child_reduced_log = modifier_log_->get_tree_log(child_hash);
+      child_reduced_log.ensure_node_run_time();
+      const std::optional<std::string> &group_node_name =
+          child_reduced_log.tree_loggers_[0]->group_node_name;
+      if (group_node_name.has_value()) {
+        this->nodes.lookup_or_add_default(*group_node_name).run_time +=
+            child_reduced_log.run_time_sum;
+      }
+      this->run_time_sum += child_reduced_log.run_time_sum;
+    }
   }
   reduced_node_run_times_ = true;
 }
diff --git a/source/blender/nodes/intern/geometry_nodes_to_lazy_function_graph.cc b/source/blender/nodes/intern/geometry_nodes_to_lazy_function_graph.cc
index 7adcf057422..d4a87326f58 100644
--- a/source/blender/nodes/intern/geometry_nodes_to_lazy_function_graph.cc
+++ b/source/blender/nodes/intern/geometry_nodes_to_lazy_function_graph.cc
@@ -484,15 +484,7 @@ class GroupNodeFunction : public LazyFunction {
     LFContext group_context = context;
     group_context.user_data = &group_user_data;
 
-    geo_eval_log::TimePoint start_time = geo_eval_log::Clock::now();
     graph_executor_->execute(params, group_context);
-    geo_eval_log::TimePoint end_time = geo_eval_log::Clock::now();
-
-    geo_eval_log::GeoTreeLogger *tree_logger =
-        &user_data->modifier_data->eval_log->get_local_tree_logger(*user_data->context_stack);
-    if (tree_logger != nullptr) {
-      tree_logger->node_execution_times.append_as(group_node_.name(), start_time, end_time);
-    }
   }
 
   void *init_storage(LinearAllocator<> &allocator) const