[Bf-blender-cvs] [f41368cf02b] asset-browser-grid-view: Fix null-reference use

Julian Eisel noreply at git.blender.org
Fri Feb 11 18:18:30 CET 2022


Commit: f41368cf02b79eb2a6117cad1d05ed52f4392d69
Author: Julian Eisel
Date:   Fri Feb 11 18:18:15 2022 +0100
Branches: asset-browser-grid-view
https://developer.blender.org/rBf41368cf02b79eb2a6117cad1d05ed52f4392d69

Fix null-reference use

===================================================================

M	source/blender/editors/asset/intern/asset_list.cc

===================================================================

diff --git a/source/blender/editors/asset/intern/asset_list.cc b/source/blender/editors/asset/intern/asset_list.cc
index 387ad778241..c12adf7b228 100644
--- a/source/blender/editors/asset/intern/asset_list.cc
+++ b/source/blender/editors/asset/intern/asset_list.cc
@@ -134,7 +134,7 @@ class AssetList : NonCopyable {
   int size() const;
   void tagMainDataDirty() const;
   void remapID(ID *id_old, ID *id_new) const;
-  AssetLibrary &asset_library() const;
+  AssetLibrary *asset_library() const;
   StringRef filepath() const;
 };
 
@@ -327,9 +327,9 @@ StringRef AssetList::filepath() const
   return filelist_dir(filelist_);
 }
 
-AssetLibrary &AssetList::asset_library() const
+AssetLibrary *AssetList::asset_library() const
 {
-  return *filelist_asset_library(filelist_);
+  return filelist_asset_library(filelist_);
 }
 
 /** \} */
@@ -568,7 +568,7 @@ AssetLibrary *ED_assetlist_library_get(const AssetLibraryReference *library_refe
 {
   AssetList *list = AssetListStorage::lookup_list(*library_reference);
   if (list) {
-    return &list->asset_library();
+    return list->asset_library();
   }
   return nullptr;
 }



More information about the Bf-blender-cvs mailing list