[Bf-blender-cvs] [48316b7e08c] geometry-nodes-curve-support: Merge branch 'master' into geometry-nodes-curve-support

[Hans Goudey]

Commit: 48316b7e08cb8b93439347c895c5f3e566ccdc8c
Author: Hans Goudey
Date:   Thu Apr 8 15:46:35 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rB48316b7e08cb8b93439347c895c5f3e566ccdc8c

Merge branch 'master' into geometry-nodes-curve-support

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



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

diff --cc source/blender/blenkernel/intern/geometry_set.cc
index 564f1e0222f,3e457e48076..2d4dfc1bf59
--- a/source/blender/blenkernel/intern/geometry_set.cc
+++ b/source/blender/blenkernel/intern/geometry_set.cc
@@@ -197,7 -178,10 +193,11 @@@ void GeometrySet::compute_boundbox_with
    if (mesh != nullptr) {
      BKE_mesh_wrapper_minmax(mesh, *r_min, *r_max);
    }
+   const Volume *volume = this->get_volume_for_read();
+   if (volume != nullptr) {
+     BKE_volume_min_max(volume, *r_min, *r_max);
+   }
 +  /* TODO: Curve boundbox. */
  }
  
  std::ostream &operator<<(std::ostream &stream, const GeometrySet &geometry_set)
diff --cc source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.cc
index b6abc17dff8,5e050517710..f16e9365b80
--- a/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_from_geometry.cc
@@@ -200,27 -200,9 +200,9 @@@ static GeometrySet get_display_geometry
                                              const GeometryComponentType used_component_type)
  {
    GeometrySet geometry_set;
-   if (sspreadsheet->object_eval_state == SPREADSHEET_OBJECT_EVAL_STATE_FINAL) {
-     if (used_component_type == GEO_COMPONENT_TYPE_MESH && object_eval->mode == OB_MODE_EDIT) {
-       Mesh *mesh = BKE_modifier_get_evaluated_mesh_from_evaluated_object(object_eval, false);
-       if (mesh == nullptr) {
-         return geometry_set;
-       }
-       BKE_mesh_wrapper_ensure_mdata(mesh);
-       MeshComponent &mesh_component = geometry_set.get_component_for_write<MeshComponent>();
-       mesh_component.replace(mesh, GeometryOwnershipType::ReadOnly);
-       mesh_component.copy_vertex_group_names_from_object(*object_eval);
-     }
-     else {
-       if (object_eval->runtime.geometry_set_eval != nullptr) {
-         /* This does not copy the geometry data itself. */
-         geometry_set = *object_eval->runtime.geometry_set_eval;
-       }
-     }
-   }
-   else {
+   if (sspreadsheet->object_eval_state == SPREADSHEET_OBJECT_EVAL_STATE_ORIGINAL) {
      Object *object_orig = DEG_get_original_object(object_eval);
 -    if (object_orig->type == OB_MESH) {
 +    if (ELEM(object_orig->type, OB_MESH, OB_CURVE, OB_POINTCLOUD)) {
        MeshComponent &mesh_component = geometry_set.get_component_for_write<MeshComponent>();
        if (object_orig->mode == OB_MODE_EDIT) {
          Mesh *mesh = (Mesh *)object_orig->data;