[Bf-blender-cvs] [f63179cc9fe] master: Fix T101424: Empty group node added to node add search
Hans Goudey
noreply at git.blender.org
Fri Oct 7 19:32:37 CEST 2022
Commit: f63179cc9fef42cc4f8b126d92b08f8b0d07dd87
Author: Hans Goudey
Date: Fri Oct 7 12:32:23 2022 -0500
Branches: master
https://developer.blender.org/rBf63179cc9fef42cc4f8b126d92b08f8b0d07dd87
Fix T101424: Empty group node added to node add search
The group node type polls true, but adding an empty group node isn't
useful, so just skip it.
===================================================================
M source/blender/editors/space_node/add_node_search.cc
===================================================================
diff --git a/source/blender/editors/space_node/add_node_search.cc b/source/blender/editors/space_node/add_node_search.cc
index cdf20f7b76e..819f0abac7c 100644
--- a/source/blender/editors/space_node/add_node_search.cc
+++ b/source/blender/editors/space_node/add_node_search.cc
@@ -178,6 +178,10 @@ static void gather_add_node_operations(const bContext &C,
if (!(node_type->poll && node_type->poll(node_type, &node_tree, &disabled_hint))) {
continue;
}
+ if ((StringRefNull(node_tree.typeinfo->group_idname) == node_type->idname)) {
+ /* Skip the empty group type. */
+ continue;
+ }
AddNodeItem item{};
item.ui_name = IFACE_(node_type->ui_name);
@@ -271,7 +275,7 @@ static void add_node_search_exec_fn(bContext *C, void *arg1, void *arg2)
static ARegion *add_node_search_tooltip_fn(
bContext *C, ARegion *region, const rcti *item_rect, void * /*arg*/, void *active)
{
- const AddNodeItem *item = static_cast<AddNodeItem *>(active);
+ const AddNodeItem *item = static_cast<const AddNodeItem *>(active);
uiSearchItemTooltipData tooltip_data{};
More information about the Bf-blender-cvs
mailing list