diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-21 23:03:31 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-21 23:03:31 +0300 |
| commit | c5b56a525cd6113caa2bd3ec7bfb91fe4a04513a (patch) | |
| tree | 77dae5ae2fbeccf6703034c94ad3e1f3aa81140b /source/blender/editors/asset/intern/asset_handle.cc | |
| parent | 34e8d79c3edbc58fd242cec0c1f2bed4e43855af (diff) | |
| parent | 67c29bc5a273b66e278bd20c18187b425acf1869 (diff) | |
Merge branch 'master' into cycles_texture_cachecycles_texture_cache
Diffstat (limited to 'source/blender/editors/asset/intern/asset_handle.cc')
| -rw-r--r-- | source/blender/editors/asset/intern/asset_handle.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/asset/intern/asset_handle.cc b/source/blender/editors/asset/intern/asset_handle.cc index aae85e61372..5c8d0b1349c 100644 --- a/source/blender/editors/asset/intern/asset_handle.cc +++ b/source/blender/editors/asset/intern/asset_handle.cc @@ -60,13 +60,13 @@ int ED_asset_handle_get_preview_icon_id(const AssetHandle *asset) } void ED_asset_handle_get_full_library_path(const bContext *C, - const AssetLibraryReference *asset_library, + const AssetLibraryReference *asset_library_ref, const AssetHandle *asset, char r_full_lib_path[FILE_MAX_LIBEXTRA]) { *r_full_lib_path = '\0'; - std::string asset_path = ED_assetlist_asset_filepath_get(C, *asset_library, *asset); + std::string asset_path = ED_assetlist_asset_filepath_get(C, *asset_library_ref, *asset); if (asset_path.empty()) { return; } |