[Bf-blender-cvs] [b4e4ee0c43e] asset-browser: Merge branch 'asset-browser-poselib' into asset-browser

[Julian Eisel]

Commit: b4e4ee0c43ee56f7e44905a5d642c0e86a222311
Author: Julian Eisel
Date:   Sun Jun 13 23:24:56 2021 +0200
Branches: asset-browser
https://developer.blender.org/rBb4e4ee0c43ee56f7e44905a5d642c0e86a222311

Merge branch 'asset-browser-poselib' into asset-browser

===================================================================



===================================================================

diff --cc source/blender/editors/interface/interface_template_asset_view.cc
index 1a564d86eb0,c5988bb9ad7..bfcf6a1aa17
--- a/source/blender/editors/interface/interface_template_asset_view.cc
+++ b/source/blender/editors/interface/interface_template_asset_view.cc
@@@ -67,9 -67,8 +67,9 @@@ static void asset_view_item_but_drag_se
        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);