diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-14 23:24:14 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-14 23:24:14 +0100 |
| commit | 0dbb632116fb934902939ce66bfac0d71a980dd8 (patch) | |
| tree | 381f4437f55147c7a22ee85f9b85b0c9803f4fec | |
| parent | 80dbcfd9958bf6cc1d348f9a35ec671cb434a741 (diff) | |
| parent | a1c10dbbd8c390b7d0709c61bc31a2d5636c2941 (diff) | |
Merge pull request #68564 from Mickeon/node-no-remove-group-error
Strip ERR_FAIL from `Node.remove_from_group()`
| -rw-r--r-- | doc/classes/Node.xml | 2 | ||||
| -rw-r--r-- | scene/main/node.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml index b83bff5d5e..f910112a76 100644 --- a/doc/classes/Node.xml +++ b/doc/classes/Node.xml @@ -606,7 +606,7 @@ <return type="void" /> <param index="0" name="group" type="StringName" /> <description> - Removes a node from a group. See notes in the description, and the group methods in [SceneTree]. + Removes a node from the [param group]. Does nothing if the node is not in the [param group]. See notes in the description, and the group methods in [SceneTree]. </description> </method> <method name="replace_by"> diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 473f69a172..377620af64 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -1759,11 +1759,11 @@ void Node::add_to_group(const StringName &p_identifier, bool p_persistent) { } void Node::remove_from_group(const StringName &p_identifier) { - ERR_FAIL_COND(!data.grouped.has(p_identifier)); - HashMap<StringName, GroupData>::Iterator E = data.grouped.find(p_identifier); - ERR_FAIL_COND(!E); + if (!E) { + return; + } if (data.tree) { data.tree->remove_from_group(E->key, this); |