Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2021-03-25 21:10:11 +0300
committerJulian Eisel <julian@blender.org>2021-03-25 21:10:11 +0300
commit91b87d8d7fb8aec62faf00e5e0c3619d2753a92e (patch)
treed077410c7b6f81a2e42ad708307bb3c34ca33aa3
parente7462cfa4429c55c0acd3992d6fd525f008aa022 (diff)
Cleanup: Improve naming of new temporary ID consumer functions
-rw-r--r--source/blender/editors/asset/asset_edit.cc14
-rw-r--r--source/blender/editors/include/ED_asset.h14
2 files changed, 14 insertions, 14 deletions
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,