Commit: 4121e32edd9135fc364426f4b3a1763aa32989f1 Author: Iliya Katueshenock Date: Wed Dec 14 19:35:43 2022 +0100 Branches: master https://developer.blender.org/rB4121e32edd9135fc364426f4b3a1763aa32989f1
Fix T102740: don't allow inserting group into itself Differential Revision: https://developer.blender.org/D16602 =================================================================== M source/blender/editors/space_node/node_group.cc =================================================================== diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc index be9a6c69601..2c28a8fae34 100644 --- a/source/blender/editors/space_node/node_group.cc +++ b/source/blender/editors/space_node/node_group.cc @@ -1114,6 +1114,24 @@ void NODE_OT_group_make(wmOperatorType *ot) /** \name Group Insert Operator * \{ */ +static bool node_tree_contains_tree_recursive(const bNodeTree &ntree_to_search_in, + const bNodeTree &ntree_to_search_for) +{ + if (&ntree_to_search_in == &ntree_to_search_for) { + return true; + } + ntree_to_search_in.ensure_topology_cache(); + for (const bNode *node : ntree_to_search_in.group_nodes()) { + if (node->id) { + if (node_tree_contains_tree_recursive(*reinterpret_cast<bNodeTree *>(node->id), + ntree_to_search_for)) { + return true; + } + } + } + return false; +} + static int node_group_insert_exec(bContext *C, wmOperator *op) { SpaceNode *snode = CTX_wm_space_node(C); @@ -1128,8 +1146,21 @@ static int node_group_insert_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - bNodeTree *ngroup = (bNodeTree *)gnode->id; + bNodeTree *ngroup = reinterpret_cast<bNodeTree *>(gnode->id); VectorSet<bNode *> nodes_to_group = get_nodes_to_group(*ntree, gnode); + + /* Make sure that there won't be a node group containing itself afterwards. */ + for (const bNode *group : nodes_to_group) { + if (!group->is_group() || group->id == nullptr) { + continue; + } + if (node_tree_contains_tree_recursive(*reinterpret_cast<bNodeTree *>(group->id), *ngroup)) { + BKE_reportf( + op->reports, RPT_WARNING, "Can not insert group '%s' in '%s'", group->name, gnode->name); + return OPERATOR_CANCELLED; + } + } + if (!node_group_make_test_selected(*ntree, nodes_to_group, ngroup->idname, *op->reports)) { return OPERATOR_CANCELLED; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
