diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-24 17:32:28 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-24 17:32:28 +0300 |
| commit | 9bff211ac9e38de090ac2cddd2bbe9636443af6f (patch) | |
| tree | cfea5324a6b776729b5520ea007bfb9200e30eec /source/blender/editors/space_view3d/space_view3d.c | |
| parent | 23209dc8f9aedf90ddf4cc53d7170d38ddaeb5d7 (diff) | |
| parent | 05c7d935e77025b87c5593dcbae38de42ed5a3ce (diff) | |
Merge branch 'master' into node-group-single-socket-nodes
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 54f10e259f9..5baa12f7367 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -53,6 +53,7 @@ #include "BKE_screen.h" #include "BKE_workspace.h" +#include "ED_asset.h" #include "ED_render.h" #include "ED_screen.h" #include "ED_space_api.h" @@ -495,7 +496,7 @@ static ID_Type view3d_drop_id_in_main_region_poll_get_id_type(bContext *C, wmDragAsset *asset_drag = WM_drag_get_asset_data(drag, 0); if (asset_drag) { - return asset_drag->id_type; + return ED_asset_handle_get_id_type(asset_drag->asset_handle); } return 0; |