diff options
| author | Julian Eisel <julian@blender.org> | 2021-07-20 21:58:15 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-07-20 22:30:03 +0300 |
| commit | 5a1b1c0ed2e6d085c93b8afd699407f92cc2d07d (patch) | |
| tree | dc52de62700959ffedbc786e79ed39f6fe36f90b /source/blender/editors/interface/interface_template_asset_view.cc | |
| parent | 207df439e1ad50b3af691f91710b886d0e997993 (diff) | |
Cleanup: Getters for asset-handle data
While the asset-handle design is supposed to be temporary (see
35affaa971cf), I prefer keeping the fact that it's nothing but a file
entry pointer an implementation detail that is abstracted away. So this
introduces getters for the file data we typically access for
asset-handles.
Diffstat (limited to 'source/blender/editors/interface/interface_template_asset_view.cc')
| -rw-r--r-- | source/blender/editors/interface/interface_template_asset_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc index 5a05813f947..1d8420718bb 100644 --- a/source/blender/editors/interface/interface_template_asset_view.cc +++ b/source/blender/editors/interface/interface_template_asset_view.cc @@ -52,7 +52,7 @@ static void asset_view_item_but_drag_set(uiBut *but, AssetViewListData *list_data, AssetHandle *asset_handle) { - ID *id = asset_handle->file_data->id; + ID *id = ED_asset_handle_get_local_id(asset_handle); if (id != nullptr) { UI_but_drag_set_id(but, id); return; @@ -70,7 +70,7 @@ static void asset_view_item_but_drag_set(uiBut *but, BLI_strdup(blend_path), asset_handle->file_data->blentype, FILE_ASSET_IMPORT_APPEND, - asset_handle->file_data->preview_icon_id, + ED_asset_handle_get_preview_icon_id(asset_handle), imbuf, 1.0f); } @@ -101,8 +101,8 @@ static void asset_view_draw_item(uiList *ui_list, uiBut *but = uiDefIconTextBut(block, UI_BTYPE_PREVIEW_TILE, 0, - asset_handle->file_data->preview_icon_id, - asset_handle->file_data->name, + ED_asset_handle_get_preview_icon_id(asset_handle), + ED_asset_handle_get_name(asset_handle), 0, 0, size_x, @@ -114,7 +114,7 @@ static void asset_view_draw_item(uiList *ui_list, 0, ""); ui_def_but_icon(but, - asset_handle->file_data->preview_icon_id, + ED_asset_handle_get_preview_icon_id(asset_handle), /* NOLINTNEXTLINE: bugprone-suspicious-enum-usage */ UI_HAS_ICON | UI_BUT_ICON_PREVIEW); if (!ui_list->dyn_data->custom_drag_optype) { |