[Bf-blender-cvs] [9094e3cd774] temp-spreadsheet-row-filter: Merge branch 'master' into temp-spreadsheet-row-filter

[Hans Goudey]

Commit: 9094e3cd774230c31c2a7cf58432a7e054f7ea8b
Author: Hans Goudey
Date:   Mon Apr 19 16:28:15 2021 -0500
Branches: temp-spreadsheet-row-filter
https://developer.blender.org/rB9094e3cd774230c31c2a7cf58432a7e054f7ea8b

Merge branch 'master' into temp-spreadsheet-row-filter

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



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

diff --cc source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index d52c7350d82,405f0cd9455..f33da1c2b86
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@@ -92,38 -93,32 +93,38 @@@ std::unique_ptr<ColumnValues> GeometryD
        if (column_id.index != -1) {
          return {};
        }
 -      return column_values_from_function(
 -          column_id.name, domain_size, [varray](int index, CellValue &r_cell_value) {
 -            float value;
 -            varray->get(index, &value);
 -            r_cell_value.value_float = value;
 -          });
 +      return column_values_from_function(SPREADSHEET_VALUE_TYPE_FLOAT,
 +                                         column_id.name,
 +                                         domain_size,
-                                          [attribute](int index, CellValue &r_cell_value) {
++                                         [varray](int index, CellValue &r_cell_value) {
 +                                           float value;
-                                            attribute->get(index, &value);
++                                           varray->get(index, &value);
 +                                           r_cell_value.value_float = value;
 +                                         });
      case CD_PROP_INT32:
        if (column_id.index != -1) {
          return {};
        }
 -      return column_values_from_function(
 -          column_id.name, domain_size, [varray](int index, CellValue &r_cell_value) {
 -            int value;
 -            varray->get(index, &value);
 -            r_cell_value.value_int = value;
 -          });
 +      return column_values_from_function(SPREADSHEET_VALUE_TYPE_INT32,
 +                                         column_id.name,
 +                                         domain_size,
-                                          [attribute](int index, CellValue &r_cell_value) {
++                                         [varray](int index, CellValue &r_cell_value) {
 +                                           int value;
-                                            attribute->get(index, &value);
++                                           varray->get(index, &value);
 +                                           r_cell_value.value_int = value;
 +                                         });
      case CD_PROP_BOOL:
        if (column_id.index != -1) {
          return {};
        }
 -      return column_values_from_function(
 -          column_id.name, domain_size, [varray](int index, CellValue &r_cell_value) {
 -            bool value;
 -            varray->get(index, &value);
 -            r_cell_value.value_bool = value;
 -          });
 +      return column_values_from_function(SPREADSHEET_VALUE_TYPE_BOOL,
 +                                         column_id.name,
 +                                         domain_size,
-                                          [attribute](int index, CellValue &r_cell_value) {
++                                         [varray](int index, CellValue &r_cell_value) {
 +                                           bool value;
-                                            attribute->get(index, &value);
++                                           varray->get(index, &value);
 +                                           r_cell_value.value_bool = value;
 +                                         });
      case CD_PROP_FLOAT2: {
        if (column_id.index < 0 || column_id.index > 1) {
          return {};
@@@ -131,12 -126,9 +132,12 @@@
        const std::array<const char *, 2> suffixes = {" X", " Y"};
        const std::string name = StringRef(column_id.name) + suffixes[column_id.index];
        return column_values_from_function(
 -          name, domain_size, [varray, axis = column_id.index](int index, CellValue &r_cell_value) {
 +          SPREADSHEET_VALUE_TYPE_FLOAT,
 +          name,
 +          domain_size,
-           [attribute, axis = column_id.index](int index, CellValue &r_cell_value) {
++          [varray, axis = column_id.index](int index, CellValue &r_cell_value) {
              float2 value;
-             attribute->get(index, &value);
+             varray->get(index, &value);
              r_cell_value.value_float = value[axis];
            });
      }
@@@ -147,12 -139,9 +148,12 @@@
        const std::array<const char *, 3> suffixes = {" X", " Y", " Z"};
        const std::string name = StringRef(column_id.name) + suffixes[column_id.index];
        return column_values_from_function(
 -          name, domain_size, [varray, axis = column_id.index](int index, CellValue &r_cell_value) {
 +          SPREADSHEET_VALUE_TYPE_FLOAT,
 +          name,
 +          domain_size,
-           [attribute, axis = column_id.index](int index, CellValue &r_cell_value) {
++          [varray, axis = column_id.index](int index, CellValue &r_cell_value) {
              float3 value;
-             attribute->get(index, &value);
+             varray->get(index, &value);
              r_cell_value.value_float = value[axis];
            });
      }
@@@ -163,12 -152,9 +164,12 @@@
        const std::array<const char *, 4> suffixes = {" R", " G", " B", " A"};
        const std::string name = StringRef(column_id.name) + suffixes[column_id.index];
        return column_values_from_function(
 -          name, domain_size, [varray, axis = column_id.index](int index, CellValue &r_cell_value) {
 +          SPREADSHEET_VALUE_TYPE_FLOAT,
 +          name,
 +          domain_size,
-           [attribute, axis = column_id.index](int index, CellValue &r_cell_value) {
++          [varray, axis = column_id.index](int index, CellValue &r_cell_value) {
              Color4f value;
-             attribute->get(index, &value);
+             varray->get(index, &value);
              r_cell_value.value_float = value[axis];
            });
      }