diff options
author | Jacques Lucke <jacques@blender.org> | 2021-04-15 14:19:27 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-04-15 14:19:27 +0300 |
commit | 5c067189e3d8e648ae2900032860c3513827939a (patch) | |
tree | 410c411bd8372eb7ea0022a0b46ce6c99c4c49f6 /source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc | |
parent | 4cf3010714e92af52a1943feac0c89a9a41f297f (diff) |
Fix T87434: spreadsheet shows same column more than once
Diffstat (limited to 'source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc')
-rw-r--r-- | source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc index dc85d86e776..520d29ce306 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc @@ -89,6 +89,9 @@ std::unique_ptr<ColumnValues> GeometryDataSource::get_column_values( int domain_size = attribute->size(); switch (attribute->custom_data_type()) { case CD_PROP_FLOAT: + if (column_id.index != -1) { + return {}; + } return column_values_from_function( column_id.name, domain_size, [attribute](int index, CellValue &r_cell_value) { float value; @@ -96,6 +99,9 @@ std::unique_ptr<ColumnValues> GeometryDataSource::get_column_values( r_cell_value.value_float = value; }); case CD_PROP_INT32: + if (column_id.index != -1) { + return {}; + } return column_values_from_function( column_id.name, domain_size, [attribute](int index, CellValue &r_cell_value) { int value; @@ -103,6 +109,9 @@ std::unique_ptr<ColumnValues> GeometryDataSource::get_column_values( r_cell_value.value_int = value; }); case CD_PROP_BOOL: + if (column_id.index != -1) { + return {}; + } return column_values_from_function( column_id.name, domain_size, [attribute](int index, CellValue &r_cell_value) { bool value; |