From 7b65086fdf9cd4e70a6acceff1947e7bd3aa5613 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 27 May 2022 19:15:58 +0200 Subject: Cleanup: Use new macro for deprecated ID types Uses the macro introduced in b45f410b315 where it makes sense. --- source/blender/editors/space_outliner/tree/tree_element_id.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/tree/tree_element_id.cc b/source/blender/editors/space_outliner/tree/tree_element_id.cc index ef5e056f229..86f5fd4eff5 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_id.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_id.cc @@ -27,6 +27,11 @@ namespace blender::ed::outliner { std::unique_ptr TreeElementID::createFromID(TreeElement &legacy_te, ID &id) { + if (ID_TYPE_IS_DEPRECATED(GS(id.name))) { + BLI_assert_msg(0, "Outliner trying to build tree-element for deprecated ID type"); + return nullptr; + } + switch (ID_Type type = GS(id.name); type) { case ID_LI: return std::make_unique(legacy_te, (Library &)id); @@ -70,10 +75,9 @@ std::unique_ptr TreeElementID::createFromID(TreeElement &legacy_t case ID_PC: case ID_CF: return std::make_unique(legacy_te, id); - /* Deprecated */ case ID_IP: - BLI_assert_msg(0, "Outliner trying to build tree-element for deprecated ID type"); - return nullptr; + BLI_assert_unreachable(); + break; } return nullptr; -- cgit v1.2.3