[Bf-blender-cvs] [afd81e26af9] blender-v3.2-release: Fix T98446: Spreadsheets filter not working on Name column
Dalai Felinto
noreply at git.blender.org
Mon May 30 16:12:43 CEST 2022
Commit: afd81e26af9e8179578873a22fb07965b648f458
Author: Dalai Felinto
Date: Mon May 30 16:11:52 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBafd81e26af9e8179578873a22fb07965b648f458
Fix T98446: Spreadsheets filter not working on Name column
===================================================================
M source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
===================================================================
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);
}
}
More information about the Bf-blender-cvs
mailing list