diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-04-26 10:09:50 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-04-26 10:09:50 +0300 |
| commit | a17ea1a6691920cc307f3e44dd285b2d8e8bdd35 (patch) | |
| tree | 441606fe1d3a59e35107f6743676ce28ec7d9222 /source/blender/editors/space_spreadsheet/space_spreadsheet.cc | |
| parent | f2d70c02f88cc00266d330d89ea916e26c0ecf44 (diff) | |
Spreadsheet: combine vector/color spreadsheet columns
Differential Revision: https://developer.blender.org/D11056
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 190f50ed443..fc9606b1249 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) { |