[Bf-blender-cvs] [95441fde674] asset-browser: General cleanup

[Julian Eisel]

Commit: 95441fde6749637cbb816b5698afbca768645ca6
Author: Julian Eisel
Date:   Mon Nov 30 17:03:08 2020 +0100
Branches: asset-browser
https://developer.blender.org/rB95441fde6749637cbb816b5698afbca768645ca6

General cleanup

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

M	source/blender/blenkernel/BKE_asset.h
M	source/blender/blenkernel/intern/asset.c
M	source/blender/blenkernel/intern/lib_id_delete.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/space_file/filelist.c
M	source/blender/windowmanager/intern/wm_operator_type.c

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

diff --git a/source/blender/blenkernel/BKE_asset.h b/source/blender/blenkernel/BKE_asset.h
index b87a23c37f0..2e97fcd9dc9 100644
--- a/source/blender/blenkernel/BKE_asset.h
+++ b/source/blender/blenkernel/BKE_asset.h
@@ -40,10 +40,10 @@ void BKE_asset_repository_info_update_for_file_read(struct AssetRepositoryInfo *
 #endif
 
 struct AssetCatalog *BKE_asset_repository_catalog_create(const char *name);
-void BKE_asset_repository_catalog_free(struct AssetCatalog *catalog);
+void BKE_asset_repository_catalog_free(struct AssetCatalog **catalog);
 
 struct AssetData *BKE_asset_data_create(void);
-void BKE_asset_data_free(struct AssetData *asset_data);
+void BKE_asset_data_free(struct AssetData **asset_data);
 
 struct CustomTagEnsureResult {
   struct CustomTag *tag;
diff --git a/source/blender/blenkernel/intern/asset.c b/source/blender/blenkernel/intern/asset.c
index aa28651399c..5ce3cbc99b4 100644
--- a/source/blender/blenkernel/intern/asset.c
+++ b/source/blender/blenkernel/intern/asset.c
@@ -57,7 +57,7 @@ void BKE_asset_repository_info_free(AssetRepositoryInfo **repository_info)
 
   LISTBASE_FOREACH_MUTABLE (AssetCatalog *, catalog, &(*repository_info)->catalogs) {
     BLI_remlink(&(*repository_info)->catalogs, catalog);
-    BKE_asset_repository_catalog_free(catalog);
+    BKE_asset_repository_catalog_free(&catalog);
   }
   MEM_SAFE_FREE(*repository_info);
 }
@@ -83,9 +83,9 @@ AssetCatalog *BKE_asset_repository_catalog_create(const char *name)
   return catalog;
 }
 
-void BKE_asset_repository_catalog_free(AssetCatalog *catalog)
+void BKE_asset_repository_catalog_free(AssetCatalog **catalog)
 {
-  MEM_freeN(catalog);
+  MEM_SAFE_FREE(*catalog);
 }
 
 AssetData *BKE_asset_data_create(void)
@@ -95,15 +95,15 @@ AssetData *BKE_asset_data_create(void)
   return asset_data;
 }
 
-void BKE_asset_data_free(AssetData *asset_data)
+void BKE_asset_data_free(AssetData **asset_data)
 {
-  if (asset_data->properties) {
-    IDP_FreeProperty(asset_data->properties);
+  if ((*asset_data)->properties) {
+    IDP_FreeProperty((*asset_data)->properties);
   }
-  MEM_SAFE_FREE(asset_data->description);
-  BLI_freelistN(&asset_data->tags);
+  MEM_SAFE_FREE((*asset_data)->description);
+  BLI_freelistN(&(*asset_data)->tags);
 
-  MEM_SAFE_FREE(asset_data);
+  MEM_SAFE_FREE(*asset_data);
 }
 
 static CustomTag *assetdata_tag_create(const char *const name)
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c
index ccbde14b8ff..592807a5b3f 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@ -66,7 +66,7 @@ void BKE_libblock_free_data(ID *id, const bool do_id_user)
   }
 
   if (id->asset_data) {
-    BKE_asset_data_free(id->asset_data);
+    BKE_asset_data_free(&id->asset_data);
   }
 
   BKE_animdata_free(id, do_id_user);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 039b9cb9e90..fd83ff7d5e7 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -961,13 +961,13 @@ static BHead *blo_bhead_read_full(FileData *fd, BHead *thisblock)
 }
 #endif /* USE_BHEAD_READ_ON_DEMAND */
 
-/* Warning! Caller's responsibility to ensure given bhead **is** and ID one! */
+/* Warning! Caller's responsibility to ensure given bhead **is** an ID one! */
 const char *blo_bhead_id_name(const FileData *fd, const BHead *bhead)
 {
   return (const char *)POINTER_OFFSET(bhead, sizeof(*bhead) + fd->id_name_offs);
 }
 
-/* Warning! Caller's responsibility to ensure given bhead **is** and ID one! */
+/* Warning! Caller's responsibility to ensure given bhead **is** an ID one! */
 AssetData *blo_bhead_id_asset_data_address(const FileData *fd, const BHead *bhead)
 {
   BLI_assert(BKE_idtype_idcode_is_valid(bhead->code));
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 49bac81d9c8..866bbf9a285 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -1411,7 +1411,7 @@ static void filelist_intern_entry_free(FileListInternEntry *entry)
   /* If we own the asset-data (it was generated from external file data), free it. */
   if (entry->asset_data &&
       ((entry->typeflag & FILE_TYPE_ASSET_EXTERNAL) == FILE_TYPE_ASSET_EXTERNAL)) {
-    BKE_asset_data_free(entry->asset_data);
+    BKE_asset_data_free(&entry->asset_data);
   }
   MEM_freeN(entry);
 }
diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c
index 1fb64987560..7621862708e 100644
--- a/source/blender/windowmanager/intern/wm_operator_type.c
+++ b/source/blender/windowmanager/intern/wm_operator_type.c
@@ -277,7 +277,7 @@ void WM_operatortype_last_properties_clear_all(void)
     wmOperatorType *ot = BLI_ghashIterator_getValue(&iter);
 
     if (ot->last_properties) {
-      IDP_FreeProperty_ex(ot->last_properties, false);
+      IDP_FreeProperty(ot->last_properties);
       ot->last_properties = NULL;
     }
   }