From afd81e26af9e8179578873a22fb07965b648f458 Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dalai@blender.org>
Date: Mon, 30 May 2022 16:11:52 +0200
Subject: Fix T98446: Spreadsheets filter not working on Name column

---
 .../space_spreadsheet/spreadsheet_row_filter.cc    | 48 ++++++++++------------
 1 file changed, 22 insertions(+), 26 deletions(-)

(limited to 'source/blender/editors/space_spreadsheet')

diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
index eb8f111baa0..3ae4536b652 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
@@ -190,33 +190,29 @@ static void apply_row_filter(const SpreadsheetRowFilter &row_filter,
   }
   else if (column_data.type().is<InstanceReference>()) {
     const StringRef value = row_filter.value_string;
-    switch (row_filter.operation) {
-      case SPREADSHEET_ROW_FILTER_EQUAL: {
-        apply_filter_operation(
-            column_data.typed<InstanceReference>(),
-            [&](const InstanceReference cell) {
-              switch (cell.type()) {
-                case InstanceReference::Type::Object: {
-                  return value == (reinterpret_cast<ID &>(cell.object()).name + 2);
-                }
-                case InstanceReference::Type::Collection: {
-                  return value == (reinterpret_cast<ID &>(cell.collection()).name + 2);
-                }
-                case InstanceReference::Type::GeometrySet: {
-                  return false;
-                }
-                case InstanceReference::Type::None: {
-                  return false;
-                }
-              }
-              BLI_assert_unreachable();
+
+    apply_filter_operation(
+        column_data.typed<InstanceReference>(),
+        [&](const InstanceReference cell) {
+          switch (cell.type()) {
+            case InstanceReference::Type::Object: {
+              return value == (reinterpret_cast<ID &>(cell.object()).name + 2);
+            }
+            case InstanceReference::Type::Collection: {
+              return value == (reinterpret_cast<ID &>(cell.collection()).name + 2);
+            }
+            case InstanceReference::Type::GeometrySet: {
               return false;
-            },
-            prev_mask,
-            new_indices);
-        break;
-      }
-    }
+            }
+            case InstanceReference::Type::None: {
+              return false;
+            }
+          }
+          BLI_assert_unreachable();
+          return false;
+        },
+        prev_mask,
+        new_indices);
   }
 }
 
-- 
cgit v1.2.3