From a1c10dbbd8c390b7d0709c61bc31a2d5636c2941 Mon Sep 17 00:00:00 2001
From: Micky <micheledevita2@gmail.com>
Date: Sat, 12 Nov 2022 16:01:17 +0100
Subject: Strip ERR_FAIL from `Node.remove_from_group()`

Also simplifies group check removing unnecessary `!data.grouped.has`
---
 doc/classes/Node.xml | 2 +-
 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 304504a82e..a16bf543d8 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);
-- 
cgit v1.2.3