[Bf-blender-cvs] [bf68462387e] curve-nodes-modifier: Merge branch 'master' into curve-nodes-modifier

[Hans Goudey]

Commit: bf68462387e48df3e45aa2e6abef233d65ea1509
Author: Hans Goudey
Date:   Fri Jun 25 10:34:39 2021 -0500
Branches: curve-nodes-modifier
https://developer.blender.org/rBbf68462387e48df3e45aa2e6abef233d65ea1509

Merge branch 'master' into curve-nodes-modifier

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



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

diff --cc source/blender/editors/space_spreadsheet/space_spreadsheet.cc
index 104854b684e,f8654500044..b0f1d2fbcb7
--- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
+++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
@@@ -253,18 -293,31 +293,31 @@@ Object *spreadsheet_get_object_eval(con
    }
    const ID_Type id_type = GS(used_id->name);
    if (id_type != ID_OB) {
-     return {};
+     return nullptr;
    }
    Object *object_orig = (Object *)used_id;
 -  if (!ELEM(object_orig->type, OB_MESH, OB_POINTCLOUD, OB_VOLUME)) {
 +  if (!ELEM(object_orig->type, OB_MESH, OB_POINTCLOUD, OB_VOLUME, OB_CURVE)) {
-     return {};
+     return nullptr;
    }
+ 
    Object *object_eval = DEG_get_evaluated_object(depsgraph, object_orig);
    if (object_eval == nullptr) {
-     return {};
+     return nullptr;
    }
  
-   return data_source_from_geometry(C, object_eval);
+   return object_eval;
+ }
+ 
+ static std::unique_ptr<DataSource> get_data_source(const bContext *C)
+ {
+   Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
+   SpaceSpreadsheet *sspreadsheet = CTX_wm_space_spreadsheet(C);
+ 
+   Object *object_eval = spreadsheet_get_object_eval(sspreadsheet, depsgraph);
+   if (object_eval) {
+     return data_source_from_geometry(C, object_eval);
+   }
+   return {};
  }
  
  static float get_column_width(const ColumnValues &values)