diff options
author | Julian Eisel <julian@blender.org> | 2021-04-12 19:43:23 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-04-12 19:48:22 +0300 |
commit | 2bd9f9d976560c55a15ed297032f7d73c2f101cc (patch) | |
tree | d109e1131272c799f16825ce1818aac1e79fe1fc /source/blender/nodes/geometry/node_geometry_util.cc | |
parent | cbd193261969c9b4e1f14297d5888bad2946600e (diff) |
UI/Nodes: Improve feedback when adding node fails (e.g. on drag & drop)
This is especially useful when trying to add a node group instance, e.g. via
drag & drop from the Outliner or Asset Browser.
Previously this would just silently fail, with no information why. This is a
source of confusion, e.g. earlier, it took me a moment to realize I was
dragging a node group into itself, which failed of course.
Blender should always try to help the user with useful error messages.
Adds error messages like: "Nesting a node group inside of itself is not
allowed", "Not a compositor node tree", etc.
Adds a disabled hint return argument to node and node tree polling functions.
On error the hint is reported, or could even be shown in advance (e.g. if
checked via an operator poll option).
Differential Revision: https://developer.blender.org/D10422
Reviewed by: Jacques Lucke
Diffstat (limited to 'source/blender/nodes/geometry/node_geometry_util.cc')
-rw-r--r-- | source/blender/nodes/geometry/node_geometry_util.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc index 0f725ecf211..93cada2982b 100644 --- a/source/blender/nodes/geometry/node_geometry_util.cc +++ b/source/blender/nodes/geometry/node_geometry_util.cc @@ -56,9 +56,15 @@ void update_attribute_input_socket_availabilities(bNode &node, } // namespace blender::nodes -bool geo_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree) +bool geo_node_poll_default(bNodeType *UNUSED(ntype), + bNodeTree *ntree, + const char **r_disabled_hint) { - return STREQ(ntree->idname, "GeometryNodeTree"); + if (!STREQ(ntree->idname, "GeometryNodeTree")) { + *r_disabled_hint = "Not a geometry node tree"; + return false; + } + return true; } void geo_node_type_base(bNodeType *ntype, int type, const char *name, short nclass, short flag) |