diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-04-26 10:16:53 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-04-26 10:16:53 +0300 |
| commit | 9b64927a8aabe3f71784be1022a1daf3fb4e0b28 (patch) | |
| tree | 0f4929197a1adf8c23dd26d2615373f7f49a63a5 /source/blender/editors/space_spreadsheet/space_spreadsheet.cc | |
| parent | c63142ca8fc22ecd5510251d755d73cfc57a7c7b (diff) | |
| parent | a17ea1a6691920cc307f3e44dd285b2d8e8bdd35 (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/editors/space_spreadsheet/space_spreadsheet.cc')
| -rw-r--r-- | source/blender/editors/space_spreadsheet/space_spreadsheet.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index 26f89a0700e..2741b79fbb8 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -304,7 +304,12 @@ static void update_visible_columns(ListBase &columns, DataSource &data_source) continue; } - used_ids.add(*column->id); + if (!used_ids.add(*column->id)) { + /* Remove duplicate columns for now. */ + BLI_remlink(&columns, column); + spreadsheet_column_free(column); + continue; + } } data_source.foreach_default_column_ids([&](const SpreadsheetColumnID &column_id) { |