[Bf-blender-cvs] [1a2e2dcddc5] master: Cleanup: Improve function name for asset identifier creation

[Julian Eisel]

Commit: 1a2e2dcddc5d2d798ffb24b9656cfb12ec4ed04d
Author: Julian Eisel
Date:   Thu Dec 1 11:41:04 2022 +0100
Branches: master
https://developer.blender.org/rB1a2e2dcddc5d2d798ffb24b9656cfb12ec4ed04d

Cleanup: Improve function name for asset identifier creation

I find this a bit more explanatory/clear.

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

M       source/blender/asset_system/AS_asset_library.hh
M       source/blender/asset_system/intern/asset_library.cc

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

diff --git a/source/blender/asset_system/AS_asset_library.hh 
b/source/blender/asset_system/AS_asset_library.hh
index 9f9b1b80343..f272ed6ff51 100644
--- a/source/blender/asset_system/AS_asset_library.hh
+++ b/source/blender/asset_system/AS_asset_library.hh
@@ -125,7 +125,7 @@ class AssetLibrary {
    * Create an asset identifier from the root path of this asset library and 
the given relative
    * asset path (relative to the asset library root directory).
    */
-  AssetIdentifier derive_asset_identifier(StringRef relative_asset_path);
+  AssetIdentifier asset_identifier_from_library(StringRef relative_asset_path);
 
   StringRefNull root_path() const;
 
diff --git a/source/blender/asset_system/intern/asset_library.cc 
b/source/blender/asset_system/intern/asset_library.cc
index 2f3b56d226a..73f81a50e46 100644
--- a/source/blender/asset_system/intern/asset_library.cc
+++ b/source/blender/asset_system/intern/asset_library.cc
@@ -152,13 +152,13 @@ AssetRepresentation 
&AssetLibrary::add_external_asset(StringRef relative_asset_p
                                                       StringRef name,
                                                       
std::unique_ptr<AssetMetaData> metadata)
 {
-  AssetIdentifier identifier = derive_asset_identifier(relative_asset_path);
+  AssetIdentifier identifier = 
asset_identifier_from_library(relative_asset_path);
   return asset_storage_->add_external_asset(std::move(identifier), name, 
std::move(metadata));
 }
 
 AssetRepresentation &AssetLibrary::add_local_id_asset(StringRef 
relative_asset_path, ID &id)
 {
-  AssetIdentifier identifier = derive_asset_identifier(relative_asset_path);
+  AssetIdentifier identifier = 
asset_identifier_from_library(relative_asset_path);
   return asset_storage_->add_local_id_asset(std::move(identifier), id);
 }
 
@@ -215,7 +215,7 @@ void AssetLibrary::on_blend_save_post(struct Main *main,
   }
 }
 
-AssetIdentifier AssetLibrary::derive_asset_identifier(StringRef 
relative_asset_path)
+AssetIdentifier AssetLibrary::asset_identifier_from_library(StringRef 
relative_asset_path)
 {
   return AssetIdentifier(root_path_, relative_asset_path);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs