1 files changed, 74 insertions, 17 deletions
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
index e1ff4b59b14..6806e185cfe 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
@@ -195,25 +195,82 @@ static void apply_row_filter(const SpreadsheetRowFilter &row_filter,
   }
   else if (column_data.type().is<ColorGeometry4f>()) {
     const ColorGeometry4f value = row_filter.value_color;
-    const float threshold_sq = pow2f(row_filter.threshold);
-    apply_filter_operation(
-        column_data.typed<ColorGeometry4f>(),
-        [&](const ColorGeometry4f cell) { return len_squared_v4v4(cell, value) <= threshold_sq; },
-        prev_mask,
-        new_indices);
+    switch (row_filter.operation) {
+      case SPREADSHEET_ROW_FILTER_EQUAL: {
+        const float threshold_sq = pow2f(row_filter.threshold);
+        apply_filter_operation(
+            column_data.typed<ColorGeometry4f>(),
+            [&](const ColorGeometry4f cell) {
+              return len_squared_v4v4(cell, value) <= threshold_sq;
+            },
+            prev_mask,
+            new_indices);
+        break;
+      }
+      case SPREADSHEET_ROW_FILTER_GREATER: {
+        apply_filter_operation(
+            column_data.typed<ColorGeometry4f>(),
+            [&](const ColorGeometry4f cell) {
+              return cell.r > value.r && cell.g > value.g && cell.b > value.b && cell.a > value.a;
+            },
+            prev_mask,
+            new_indices);
+        break;
+      }
+      case SPREADSHEET_ROW_FILTER_LESS: {
+        apply_filter_operation(
+            column_data.typed<ColorGeometry4f>(),
+            [&](const ColorGeometry4f cell) {
+              return cell.r < value.r && cell.g < value.g && cell.b < value.b && cell.a < value.a;
+            },
+            prev_mask,
+            new_indices);
+        break;
+      }
+    }
   }
   else if (column_data.type().is<ColorGeometry4b>()) {
-    const ColorGeometry4b value = row_filter.value_byte_color;
-    const float4 value_floats = {(float)value.r, (float)value.g, (float)value.b, (float)value.a};
-    const float threshold_sq = pow2f(row_filter.threshold);
-    apply_filter_operation(
-        column_data.typed<ColorGeometry4b>(),
-        [&](const ColorGeometry4b cell) {
-          const float4 cell_floats = {(float)cell.r, (float)cell.g, (float)cell.b, (float)cell.a};
-          return len_squared_v4v4(value_floats, cell_floats) <= threshold_sq;
-        },
-        prev_mask,
-        new_indices);
+    const ColorGeometry4f value = row_filter.value_color;
+    switch (row_filter.operation) {
+      case SPREADSHEET_ROW_FILTER_EQUAL: {
+        const float4 value_floats = {
+            (float)value.r, (float)value.g, (float)value.b, (float)value.a};
+        const float threshold_sq = pow2f(row_filter.threshold);
+        apply_filter_operation(
+            column_data.typed<ColorGeometry4b>(),
+            [&](const ColorGeometry4b cell_bytes) {
+              const ColorGeometry4f cell = cell_bytes.decode();
+              const float4 cell_floats = {
+                  (float)cell.r, (float)cell.g, (float)cell.b, (float)cell.a};
+              return len_squared_v4v4(value_floats, cell_floats) <= threshold_sq;
+            },
+            prev_mask,
+            new_indices);
+        break;
+      }
+      case SPREADSHEET_ROW_FILTER_GREATER: {
+        apply_filter_operation(
+            column_data.typed<ColorGeometry4b>(),
+            [&](const ColorGeometry4b cell_bytes) {
+              const ColorGeometry4f cell = cell_bytes.decode();
+              return cell.r > value.r && cell.g > value.g && cell.b > value.b && cell.a > value.a;
+            },
+            prev_mask,
+            new_indices);
+        break;
+      }
+      case SPREADSHEET_ROW_FILTER_LESS: {
+        apply_filter_operation(
+            column_data.typed<ColorGeometry4b>(),
+            [&](const ColorGeometry4b cell_bytes) {
+              const ColorGeometry4f cell = cell_bytes.decode();
+              return cell.r < value.r && cell.g < value.g && cell.b < value.b && cell.a < value.a;
+            },
+            prev_mask,
+            new_indices);
+        break;
+      }
+    }
   }
   else if (column_data.type().is<InstanceReference>()) {
     const StringRef value = row_filter.value_string;