[Bf-blender-cvs] [050a9f5f0df] temp-geometry-nodes-evaluator-refactor: Merge branch 'master' into temp-geometry-nodes-evaluator-refactor

[Jacques Lucke]

Commit: 050a9f5f0df11fb1714f5f0f101149d79a4c951a
Author: Jacques Lucke
Date:   Mon Jul 18 22:20:30 2022 +0200
Branches: temp-geometry-nodes-evaluator-refactor
https://developer.blender.org/rB050a9f5f0df11fb1714f5f0f101149d79a4c951a

Merge branch 'master' into temp-geometry-nodes-evaluator-refactor

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



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

diff --cc source/blender/editors/include/UI_interface.hh
index 5ff567cea9d,82bfdd7e212..6c756984203
--- a/source/blender/editors/include/UI_interface.hh
+++ b/source/blender/editors/include/UI_interface.hh
@@@ -44,11 -44,12 +44,11 @@@ void context_path_add_generic(Vector<Co
  
  void template_breadcrumbs(uiLayout &layout, Span<ContextPathItem> context_path);
  
 -void attribute_search_add_items(
 -    StringRefNull str,
 -    bool can_create_attribute,
 -    Span<const nodes::geometry_nodes_eval_log::GeometryAttributeInfo *> infos,
 -    uiSearchItems *items,
 -    bool is_first);
 +void attribute_search_add_items(StringRefNull str,
-                                 bool is_output,
++                                bool can_create_attribute,
 +                                Span<const nodes::geo_eval_log::GeometryAttributeInfo *> infos,
 +                                uiSearchItems *items,
 +                                bool is_first);
  
  }  // namespace blender::ui
  
diff --cc source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index 7f29664c6a1,2a87c51da5d..917a28baae0
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@@ -446,44 -458,31 +457,32 @@@ static void find_fields_to_evaluate(con
      /* No viewer is currently referenced by the context path. */
      return;
    }
 -  const geo_log::NodeLog *node_log = geo_log::ModifierLog::find_node_by_spreadsheet_editor_context(
 -      *sspreadsheet);
 -  if (node_log == nullptr) {
 -    return;
 -  }
 -  for (const geo_log::SocketLog &socket_log : node_log->input_logs()) {
 -    const geo_log::ValueLog *value_log = socket_log.value();
 -    if (value_log == nullptr) {
 -      continue;
 -    }
 -    if (const geo_log::GFieldValueLog *field_value_log =
 -            dynamic_cast<const geo_log::GFieldValueLog *>(value_log)) {
 -      const GField &field = field_value_log->field();
 -      if (field) {
 -        r_fields.add("Viewer", std::move(field));
 -      }
 -    }
 -    if (const geo_log::GenericValueLog *generic_value_log =
 -            dynamic_cast<const geo_log::GenericValueLog *>(value_log)) {
 -      GPointer value = generic_value_log->value();
 -      r_fields.add("Viewer", fn::make_constant_field(*value.type(), value.get()));
 -    }
 -  }
 +  // const geo_log::NodeLog *node_log =
 +  // geo_log::ModifierLog::find_node_by_spreadsheet_editor_context(
 +  //     *sspreadsheet);
 +  // if (node_log == nullptr) {
 +  //   return;
 +  // }
 +  // for (const geo_log::SocketLog &socket_log : node_log->input_logs()) {
 +  //   const geo_log::ValueLog *value_log = socket_log.value();
 +  //   if (value_log == nullptr) {
 +  //     continue;
 +  //   }
 +  //   if (const geo_log::GFieldValueLog *field_value_log =
 +  //           dynamic_cast<const geo_log::GFieldValueLog *>(value_log)) {
 +  //     const GField &field = field_value_log->field();
 +  //     if (field) {
 +  //       r_fields.add("Viewer", std::move(field));
 +  //     }
 +  //   }
 +  //   if (const geo_log::GenericValueLog *generic_value_log =
 +  //           dynamic_cast<const geo_log::GenericValueLog *>(value_log)) {
 +  //     GPointer value = generic_value_log->value();
 +  //     r_fields.add("Viewer", fn::make_constant_field(*value.type(), value.get()));
 +  //   }
 +  // }
  }
  
- static GeometryComponentType get_display_component_type(const bContext *C, Object *object_eval)
- {
-   SpaceSpreadsheet *sspreadsheet = CTX_wm_space_spreadsheet(C);
-   if (sspreadsheet->object_eval_state != SPREADSHEET_OBJECT_EVAL_STATE_ORIGINAL) {
-     return (GeometryComponentType)sspreadsheet->geometry_component_type;
-   }
-   if (object_eval->type == OB_POINTCLOUD) {
-     return GEO_COMPONENT_TYPE_POINT_CLOUD;
-   }
-   return GEO_COMPONENT_TYPE_MESH;
- }
- 
  class GeometryComponentCacheKey : public SpreadsheetCache::Key {
   public:
    /* Use the pointer to the geometry component as a key to detect when the geometry changed. */
diff --cc source/blender/nodes/NOD_geometry_exec.hh
index bfec2109e2c,0d5ba6cf5db..4700bc92cd3
--- a/source/blender/nodes/NOD_geometry_exec.hh
+++ b/source/blender/nodes/NOD_geometry_exec.hh
@@@ -3,20 -3,17 +3,17 @@@
  #pragma once
  
  #include "FN_field.hh"
 +#include "FN_lazy_function.hh"
  #include "FN_multi_function_builder.hh"
  
- #include "BKE_attribute_access.hh"
  #include "BKE_geometry_fields.hh"
  #include "BKE_geometry_set.hh"
- #include "BKE_geometry_set_instances.hh"
  
  #include "DNA_node_types.h"
  
  #include "NOD_derived_node_tree.hh"
 -#include "NOD_geometry_nodes_eval_log.hh"
 +#include "NOD_geometry_nodes_to_lazy_function_graph.hh"
  
--struct Depsgraph;
  struct ModifierData;
  
  namespace blender::nodes {