From 761e6b1b78da9bcfdb4bafdd2a9db062c8d4963c Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Fri, 13 Jan 2023 17:25:20 +0100
Subject: [PATCH] Fix: crash when opening node add menu

Differential Revision: https://developer.blender.org/D16995
---
 source/blender/editors/space_node/add_menu_assets.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/blender/editors/space_node/add_menu_assets.cc b/source/blender/editors/space_node/add_menu_assets.cc
index 912493c3e7e..060e8914194 100644
--- a/source/blender/editors/space_node/add_menu_assets.cc
+++ b/source/blender/editors/space_node/add_menu_assets.cc
@@ -108,6 +108,9 @@ static AssetItemTree build_catalog_tree(const bContext &C, const bNodeTree *node
 
     const asset_system::AssetCatalog *catalog = all_library->catalog_service->find_catalog(
         meta_data.catalog_id);
+    if (catalog == nullptr) {
+      return true;
+    }
     assets_per_path.add(catalog->path, LibraryAsset{all_library_ref, asset});
     return true;
   });
@@ -121,6 +124,9 @@ static AssetItemTree build_catalog_tree(const bContext &C, const bNodeTree *node
     }
     asset_system::AssetCatalog *catalog = all_library->catalog_service->find_catalog(
         item.get_catalog_id());
+    if (catalog == nullptr) {
+      return;
+    }
     catalogs_with_node_assets.insert_item(*catalog);
   });