diff options
author | Dalai Felinto <dalai@blender.org> | 2022-05-30 17:44:22 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2022-05-30 17:44:22 +0300 |
commit | c1277c5d25028ab2a09afc174ae4518d5f8e2b9e (patch) | |
tree | 75072f19fce386ecc06f0c4768276fd8bd7d2793 /source | |
parent | cd6551d4eb0cb3981657ad80f8b0fc477898e5a4 (diff) | |
parent | 68562905147fff5fc3bc4288f3b3c8cfe4e40dc0 (diff) |
Merge remote-tracking branch 'origin/blender-v3.2-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 5 | ||||
-rw-r--r-- | source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc | 48 |
2 files changed, 22 insertions, 31 deletions
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index f41d59c77ba..8ff02c7e698 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -130,11 +130,6 @@ void BKE_object_eval_transform_final(Depsgraph *depsgraph, Object *ob) else { ob->transflag &= ~OB_NEG_SCALE; } - - /* Assign evaluated version. */ - if ((ob->type == OB_GPENCIL) && (ob->runtime.gpd_eval != NULL)) { - ob->data = ob->runtime.gpd_eval; - } } void BKE_object_handle_data_update(Depsgraph *depsgraph, Scene *scene, Object *ob) 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); } } |