diff options
author | Julian Eisel <julian@blender.org> | 2021-06-14 00:24:56 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-06-14 00:24:56 +0300 |
commit | b4e4ee0c43ee56f7e44905a5d642c0e86a222311 (patch) | |
tree | 82c17a6994e9bbdd29f46f0a6258da6e467932fe | |
parent | 9caae3861dafd008bfb3a91b9becd1defe34e638 (diff) | |
parent | dc1bf8321ecd0769cc014dbd1ea5d54e1248d280 (diff) |
Merge branch 'asset-browser-poselib' into asset-browserasset-browser
-rw-r--r-- | source/blender/editors/interface/interface_template_asset_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc index 1a564d86eb0..bfcf6a1aa17 100644 --- a/source/blender/editors/interface/interface_template_asset_view.cc +++ b/source/blender/editors/interface/interface_template_asset_view.cc @@ -67,9 +67,9 @@ static void asset_view_item_but_drag_set(uiBut *but, UI_but_drag_set_asset(but, asset_handle->file_data->name, BLI_strdup(blend_path), - FILE_ASSET_IMPORT_APPEND, asset_handle->file_data->blentype, asset_handle->file_data->asset_data, + FILE_ASSET_IMPORT_APPEND, asset_handle->file_data->preview_icon_id, imbuf, 1.0f); |