From a1609340b436ff58e7e3522cc5e6d3ad1506b3ed Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 2 Jul 2021 10:07:43 -0500 Subject: Cleanup: Fix variable redeclaration warning --- .../editors/space_spreadsheet/spreadsheet_row_filter_ui.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source') 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 dbd2ef157af..219d03c1dcd 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc @@ -267,20 +267,20 @@ static void spreadsheet_row_filters_layout(const bContext *C, Panel *panel) } else { /* Assuming there's only one group of instanced panels, update the custom data pointers. */ - Panel *panel = (Panel *)region->panels.first; + Panel *panel_iter = (Panel *)region->panels.first; LISTBASE_FOREACH (SpreadsheetRowFilter *, row_filter, row_filters) { /* Move to the next instanced panel corresponding to the next filter. */ - while ((panel->type == nullptr) || !(panel->type->flag & PANEL_TYPE_INSTANCED)) { - panel = panel->next; - BLI_assert(panel != nullptr); /* There shouldn't be fewer panels than filters. */ + while ((panel_iter->type == nullptr) || !(panel_iter->type->flag & PANEL_TYPE_INSTANCED)) { + panel_iter = panel_iter->next; + BLI_assert(panel_iter != nullptr); /* There shouldn't be fewer panels than filters. */ } PointerRNA *filter_ptr = (PointerRNA *)MEM_mallocN(sizeof(PointerRNA), "panel customdata"); RNA_pointer_create(&screen->id, &RNA_SpreadsheetRowFilter, row_filter, filter_ptr); - UI_panel_custom_data_set(panel, filter_ptr); + UI_panel_custom_data_set(panel_iter, filter_ptr); - panel = panel->next; + panel_iter = panel_iter->next; } } } -- cgit v1.2.3