From a17ea1a6691920cc307f3e44dd285b2d8e8bdd35 Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Mon, 26 Apr 2021 09:09:50 +0200
Subject: Spreadsheet: combine vector/color spreadsheet columns

Differential Revision: https://developer.blender.org/D11056
---
 source/blender/editors/space_spreadsheet/spreadsheet_column.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source/blender/editors/space_spreadsheet/spreadsheet_column.hh')

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 {
-- 
cgit v1.2.3