Commit: 91b87d8d7fb8aec62faf00e5e0c3619d2753a92e
Author: Julian Eisel
Date: Thu Mar 25 19:10:11 2021 +0100
Branches: ui-asset-view-template
https://developer.blender.org/rB91b87d8d7fb8aec62faf00e5e0c3619d2753a92e
Cleanup: Improve naming of new temporary ID consumer functions
===================================================================
M source/blender/editors/asset/asset_edit.cc
M source/blender/editors/include/ED_asset.h
===================================================================
diff --git a/source/blender/editors/asset/asset_edit.cc
b/source/blender/editors/asset/asset_edit.cc
index 8fdfad7848b..fb16344b37c 100644
--- a/source/blender/editors/asset/asset_edit.cc
+++ b/source/blender/editors/asset/asset_edit.cc
@@ -187,7 +187,7 @@ class AssetTemporaryIDConsumer : NonCopyable, NonMovable {
}
};
-AssetTempIDConsumer *ED_asset_temporary_id_consumer_create(const AssetHandle
*handle)
+AssetTempIDConsumer *ED_asset_temp_id_consumer_create(const AssetHandle
*handle)
{
if (!handle) {
return nullptr;
@@ -196,16 +196,16 @@ AssetTempIDConsumer
*ED_asset_temporary_id_consumer_create(const AssetHandle *ha
OBJECT_GUARDED_NEW(AssetTemporaryIDConsumer, *handle));
}
-void ED_asset_temporary_id_consumer_free(AssetTempIDConsumer **consumer)
+void ED_asset_temp_id_consumer_free(AssetTempIDConsumer **consumer)
{
OBJECT_GUARDED_SAFE_DELETE(*consumer, AssetTemporaryIDConsumer);
}
-ID *ED_asset_temporary_id_consumer_get_id(AssetTempIDConsumer *consumer_,
- const AssetLibraryReference
*asset_library,
- ID_Type id_type,
- Main *bmain,
- ReportList *reports)
+ID *ED_asset_temp_id_consumer_ensure_local_id(AssetTempIDConsumer *consumer_,
+ const AssetLibraryReference
*asset_library,
+ ID_Type id_type,
+ Main *bmain,
+ ReportList *reports)
{
if (!(consumer_ && asset_library && bmain && reports)) {
return nullptr;
diff --git a/source/blender/editors/include/ED_asset.h
b/source/blender/editors/include/ED_asset.h
index 69ff22a6e80..0fe07f72af5 100644
--- a/source/blender/editors/include/ED_asset.h
+++ b/source/blender/editors/include/ED_asset.h
@@ -44,13 +44,13 @@ bool ED_asset_can_make_single_from_context(const struct
bContext *C);
int ED_asset_library_reference_to_enum_value(const struct
AssetLibraryReference *library);
struct AssetLibraryReference ED_asset_library_reference_from_enum_value(int
value);
-AssetTempIDConsumer *ED_asset_temporary_id_consumer_create(const AssetHandle
*handle);
-void ED_asset_temporary_id_consumer_free(AssetTempIDConsumer **consumer);
-struct ID *ED_asset_temporary_id_consumer_get_id(AssetTempIDConsumer
*consumer_,
- const AssetLibraryReference
*asset_library,
- ID_Type id_type,
- struct Main *bmain,
- struct ReportList *reports);
+AssetTempIDConsumer *ED_asset_temp_id_consumer_create(const AssetHandle
*handle);
+void ED_asset_temp_id_consumer_free(AssetTempIDConsumer **consumer);
+struct ID *ED_asset_temp_id_consumer_ensure_local_id(AssetTempIDConsumer
*consumer,
+ const
AssetLibraryReference *asset_library,
+ ID_Type id_type,
+ struct Main *bmain,
+ struct ReportList
*reports);
void ED_assetlist_storage_fetch(const struct AssetLibraryReference
*library_reference,
const struct AssetFilterSettings
*filter_settings,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
