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-07-29 18:10:11 +0300
committerJulian Eisel <julian@blender.org>2021-07-29 18:35:06 +0300
commit5be54cce3692ae590433b786d8007767e3727469 (patch)
tree9d1ea97d5c2bd931f6d0835c817b0aea2e83f6bd /source/blender/editors/interface/interface_template_asset_view.cc
parentb361b2f21488b99698e0964a919f20e91ad7838d (diff)
Cleanup: Pass asset handle to asset iterator, rather than wrapped file
This iterator was introduced before `AssetHandle` existed, so it was dealing with the file data directly. Now we want as little code as possible to deal with the file data, all access should happen via the `AssetHandle`.
Diffstat (limited to 'source/blender/editors/interface/interface_template_asset_view.cc')
-rw-r--r--source/blender/editors/interface/interface_template_asset_view.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc
index a691fff4963..fe2c660f2d0 100644
--- a/source/blender/editors/interface/interface_template_asset_view.cc
+++ b/source/blender/editors/interface/interface_template_asset_view.cc
@@ -170,11 +170,12 @@ static void asset_view_template_refresh_asset_collection(
RNA_property_collection_clear(&assets_dataptr, assets_prop);
- ED_assetlist_iterate(&asset_library, [&](FileDirEntry &file) {
+ ED_assetlist_iterate(&asset_library, [&](AssetHandle asset) {
PointerRNA itemptr, fileptr;
RNA_property_collection_add(&assets_dataptr, assets_prop, &itemptr);
- RNA_pointer_create(nullptr, &RNA_FileSelectEntry, &file, &fileptr);
+ RNA_pointer_create(
+ nullptr, &RNA_FileSelectEntry, const_cast<FileDirEntry *>(asset.file_data), &fileptr);
RNA_pointer_set(&itemptr, "file_data", fileptr);
/* Copy name from file to asset-handle name ID-property. */