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

[Hans Goudey]

Commit: 6fe76f602f76494ff93f8c9381a9d5f7522bef6f
Author: Hans Goudey
Date:   Tue Jun 15 21:17:51 2021 -0500
Branches: temp-spreadsheet-row-filter
https://developer.blender.org/rB6fe76f602f76494ff93f8c9381a9d5f7522bef6f

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

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



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

diff --cc source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index 7d36d4b1b7f,452885959f6..77248254d7b
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@@ -272,15 -245,12 +272,10 @@@ void GeometryDataSource::apply_selectio
        BMVert *vert = bm->vtable[vertex_index];
        return BM_elem_flag_test(vert, BM_ELEM_SELECT);
      };
 -    get_selected_indices_on_domain(*mesh_eval, domain_, is_vertex_selected, indices);
 +    get_selected_indices_on_domain(*mesh_eval, domain_, is_vertex_selected, rows_included);
    }
 -
 -  return indices;
  }
  
- bool InstancesDataSource::has_selection_filter() const
- {
-   return false;
- }
- 
  void InstancesDataSource::foreach_default_column_ids(
      FunctionRef<void(const SpreadsheetColumnID &)> fn) const
  {