UI/Nodes: Adding node groups via drag & drop (e.g. from Asset Browser)
ClosedPublic
Actions

Authored by Julian Eisel (Severin) on Feb 12 2021, 2:40 PM.

Details

Reviewers

Jacques Lucke (JacquesLucke)

Group Reviewers

Nodes & Physics

Maniphest Tasks

T82661: Expand asset drag & drop support to more cases

Commits

rB604e61d81d63: UI/Nodes: Adding node groups via drag & drop (e.g. from Asset Browser)

Summary

Adds NODE_OT_add_group operator to add a node group from a given name, and
uses that to register a node editor drop-box.
When dropping a node-group asset, the ID will be appended. This is what we do
for other ID assets too.

Should the node group insertion fail (e.g. the group is not compatible with the
current tree, as checked by the poll), the appended data-block is removed.

Diff Detail

Repository

rB Blender

Branch

temp-dragdrop-node-groups (branched from master)

Build Status

Buildable 12840
Build 12840: arc lint + arc unit

Event Timeline

Julian Eisel (Severin) requested review of this revision.Feb 12 2021, 2:40 PM

Julian Eisel (Severin) created this revision.

Harbormaster completed remote builds in B12840: Diff 33909.Feb 12 2021, 2:40 PM

Node groups for custom (add-on defined) node tree types need to be checked. It seems we don't actually support these properly? node_group_idname() would have to return their custom group name then, maybe other changes are needed too.

@Jacques Lucke (JacquesLucke) probably knows this :)

Julian Eisel (Severin) added a project: Nodes & Physics.Feb 12 2021, 2:43 PM

Julian Eisel (Severin) added a subscriber: Jacques Lucke (JacquesLucke).

Julian Eisel (Severin) added a task: T82661: Expand asset drag & drop support to more cases.Feb 12 2021, 2:51 PM

I haven't used Blenders node groups in a custom node group yet, so I'm not sure to what degree it is supported. I think I've seen them being used a couple of times by now though. If there is a an issue with how node_group_idname handles custom node groups, it should probably be solved separately from this patch.

source/blender/editors/space_node/node_add.c
359	This is missing user counting. Without `id_us_plus(&node_group->id);` it crashes for me when I delete the inserted group node again.

This revision now requires changes to proceed.Feb 12 2021, 3:41 PM

Julian Eisel (Severin) added inline comments.Feb 12 2021, 5:04 PM

source/blender/editors/space_node/node_add.c
359	Meh true, I used to use `WM_operator_drop_load_path()` which already sets the user (but requires unsetting on delete).

Fix missing user increment after node group is assigned to node

Harbormaster completed remote builds in B12895: Diff 33993.Feb 15 2021, 12:01 PM

Julian Eisel (Severin) added inline comments.Feb 15 2021, 12:12 PM

source/blender/editors/space_node/node_add.c
326–328	I'll actually remove this `free_id_on_error` prop again. The drop-box can handle this in a `cancel()` callback or such. But this is a general change and I'll do that in master (maybe after committing this first even).

Julian Eisel (Severin) added a child revision: D10422: UI/Nodes: Improve feedback when adding node fails (e.g. on drag & drop).Feb 15 2021, 12:14 PM

Seems to work fine in my simple test.

Appending node groups like this is obviously not ideal in all cases, but it will do for now. Also I noticed that geometry node groups are still listed in the Shader tab, but that is a separate issue as well.