diff options
author | Julian Eisel <julian@blender.org> | 2021-01-24 19:16:20 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-01-24 19:16:20 +0300 |
commit | b449da3a7d4836362a720a0072fad3e0a02f185a (patch) | |
tree | d5283eeba7e2eea63990a85e9db5a8615c6f6983 /source/blender/editors/space_node/space_node.c | |
parent | db15df0baaad0d7ddedbae86b76ebcb342b14616 (diff) |
Asset Browser: Support dragging mask assets into compositors
The normal drag & drop support was already there, just needed minor tweaks to
respect asset importing. The dragged in mask will create a mask node for
compositor node editors.
Part of T82661.
Diffstat (limited to 'source/blender/editors/space_node/space_node.c')
-rw-r--r-- | source/blender/editors/space_node/space_node.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 5999a6488c5..66a029c2087 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -672,12 +672,12 @@ static bool node_mask_drop_poll(bContext *UNUSED(C), const wmEvent *UNUSED(event), const char **UNUSED(r_tooltip)) { - return WM_drag_get_local_ID(drag, ID_MSK) != NULL; + return WM_drag_get_local_ID(drag, ID_MSK) || WM_drag_get_asset_data(drag, ID_MSK); } static void node_id_drop_copy(wmDrag *drag, wmDropBox *drop) { - ID *id = WM_drag_get_local_ID(drag, 0); + ID *id = WM_drag_get_local_ID_or_import_from_asset(drag, 0); RNA_string_set(drop->ptr, "name", id->name + 2); } |