[Bf-blender-cvs] [a79288785c8] temp-spreadsheet-row-filter: Remove commented code / always display "Only Selected" option

Hans Goudey noreply at git.blender.org
Mon Apr 19 23:53:38 CEST 2021


Commit: a79288785c8c0d32fb9e580263a34bff3685f03b
Author: Hans Goudey
Date:   Mon Apr 19 16:49:31 2021 -0500
Branches: temp-spreadsheet-row-filter
https://developer.blender.org/rBa79288785c8c0d32fb9e580263a34bff3685f03b

Remove commented code / always display "Only Selected" option

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

M	source/blender/editors/space_spreadsheet/space_spreadsheet.cc
M	source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
M	source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc

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

diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
index 59b91a4e7c5..f7b526a7d07 100644
--- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
+++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc
@@ -394,8 +394,6 @@ static void spreadsheet_main_region_draw(const bContext *C, ARegion *region)
   ED_region_tag_redraw(footer);
   ARegion *sidebar = BKE_area_find_region_type(CTX_wm_area(C), RGN_TYPE_UI);
   ED_region_tag_redraw(sidebar);
-
-  // sspreadsheet->runtime->data_source = *data_source;
 }
 
 static void spreadsheet_main_region_listener(const wmRegionListenerParams *params)
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh b/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
index 8601e14772b..7e3b79a6706 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
@@ -16,15 +16,10 @@
 
 #pragma once
 
-#include "spreadsheet_data_source.hh"
-
 typedef struct SpaceSpreadsheet_Runtime {
   int visible_rows;
   int tot_rows;
   int tot_columns;
-
-  // /* Cached data source from the main region redraw. */
-  // DataSource &data_source;
 } SpaceSpreadsheet_Runtime;
 
 void spreadsheet_operatortypes(void);
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
index 59f6469abbd..b7e19f2022d 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
@@ -204,14 +204,10 @@ static void spreadsheet_row_filters_layout(const bContext *C, Panel *panel)
   bScreen *screen = CTX_wm_screen(C);
   SpaceSpreadsheet *sspreadsheet = CTX_wm_space_spreadsheet(C);
   ListBase *row_filters = &sspreadsheet->row_filters;
-  //   const DataSource *data_source = sspreadsheet->runtime->data_source;
 
-  //   if (data_source != nullptr &&
-  //       spreadsheet_data_source_has_selection_filter(*sspreadsheet, *data_source)) {
   PointerRNA sspreadsheet_ptr;
   RNA_pointer_create(&screen->id, &RNA_SpaceSpreadsheet, sspreadsheet, &sspreadsheet_ptr);
   uiItemR(layout, &sspreadsheet_ptr, "show_only_selected", 0, IFACE_("Selected Only"), ICON_NONE);
-  //   }
 
   uiItemO(layout, nullptr, ICON_ADD, "SPREADSHEET_OT_add_row_filter_rule");



More information about the Bf-blender-cvs mailing list