diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 01:23:52 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 01:23:52 +0300 |
| commit | 24bd098dbaf8d26511cb416badb8489d1fcfe00b (patch) | |
| tree | 53e8f3f468da28fc80550db57d62afb16c6bb569 /source/blender/editors/asset/intern/asset_handle.cc | |
| parent | 32aebe8c55963d42a6b541e266e85cac25f96311 (diff) | |
| parent | d49dec896aaae5e2cdb5f2e2926f3bd010f4a0fe (diff) | |
Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023
Diffstat (limited to 'source/blender/editors/asset/intern/asset_handle.cc')
| -rw-r--r-- | source/blender/editors/asset/intern/asset_handle.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/asset/intern/asset_handle.cc b/source/blender/editors/asset/intern/asset_handle.cc index 00fffd595c0..0b2cd352d77 100644 --- a/source/blender/editors/asset/intern/asset_handle.cc +++ b/source/blender/editors/asset/intern/asset_handle.cc @@ -8,6 +8,9 @@ #include "DNA_space_types.h" +#include "BKE_asset.h" +#include "BKE_asset_representation.hh" + #include "BLO_readfile.h" #include "ED_asset_handle.h" @@ -17,12 +20,12 @@ const char *ED_asset_handle_get_name(const AssetHandle *asset) { - return asset->file_data->name; + return BKE_asset_representation_name_get(asset->file_data->asset); } -AssetMetaData *ED_asset_handle_get_metadata(const AssetHandle *asset) +AssetMetaData *ED_asset_handle_get_metadata(const AssetHandle *asset_handle) { - return asset->file_data->asset_data; + return BKE_asset_representation_metadata_get(asset_handle->file_data->asset); } ID *ED_asset_handle_get_local_id(const AssetHandle *asset) |