Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-04-26 10:09:50 +0300
committerJacques Lucke <jacques@blender.org>2021-04-26 10:09:50 +0300
commita17ea1a6691920cc307f3e44dd285b2d8e8bdd35 (patch)
tree441606fe1d3a59e35107f6743676ce28ec7d9222 /source/blender/editors/space_spreadsheet/spreadsheet_column.hh
parentf2d70c02f88cc00266d330d89ea916e26c0ecf44 (diff)
Spreadsheet: combine vector/color spreadsheet columns
Differential Revision: https://developer.blender.org/D11056
Diffstat (limited to 'source/blender/editors/space_spreadsheet/spreadsheet_column.hh')
-rw-r--r--source/blender/editors/space_spreadsheet/spreadsheet_column.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_column.hh b/source/blender/editors/space_spreadsheet/spreadsheet_column.hh
index 0f74ee0141a..bb245851d55 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_column.hh
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_column.hh
@@ -24,7 +24,7 @@ namespace blender {
template<> struct DefaultHash<SpreadsheetColumnID> {
uint64_t operator()(const SpreadsheetColumnID &column_id) const
{
- return get_default_hash_2(StringRef(column_id.name), column_id.index);
+ return get_default_hash(StringRef(column_id.name));
}
};
} // namespace blender
@@ -32,7 +32,7 @@ template<> struct DefaultHash<SpreadsheetColumnID> {
inline bool operator==(const SpreadsheetColumnID &a, const SpreadsheetColumnID &b)
{
using blender::StringRef;
- return StringRef(a.name) == StringRef(b.name) && a.index == b.index;
+ return StringRef(a.name) == StringRef(b.name);
}
namespace blender::ed::spreadsheet {