[Bf-blender-cvs] [b449da3a7d4] master: Asset Browser: Support dragging mask assets into compositors
Julian Eisel
noreply at git.blender.org
Sun Jan 24 17:21:12 CET 2021
Commit: b449da3a7d4836362a720a0072fad3e0a02f185a
Author: Julian Eisel
Date: Sun Jan 24 17:16:20 2021 +0100
Branches: master
https://developer.blender.org/rBb449da3a7d4836362a720a0072fad3e0a02f185a
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.
===================================================================
M source/blender/editors/space_node/space_node.c
===================================================================
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);
}
More information about the Bf-blender-cvs
mailing list