Przeglądaj źródła

Merge pull request #102451 from ryevdokimov/add-fail-cond-msg-reparent-self

Add `ERR_FAIL_COND_MSG` for reparenting to self
Thaddeus Crews 4 miesięcy temu
rodzic
commit
77022096ef
1 zmienionych plików z 1 dodań i 0 usunięć
  1. 1 0
      scene/main/node.cpp

+ 1 - 0
scene/main/node.cpp

@@ -1954,6 +1954,7 @@ void Node::reparent(Node *p_parent, bool p_keep_global_transform) {
 	ERR_THREAD_GUARD
 	ERR_THREAD_GUARD
 	ERR_FAIL_NULL(p_parent);
 	ERR_FAIL_NULL(p_parent);
 	ERR_FAIL_NULL_MSG(data.parent, "Node needs a parent to be reparented.");
 	ERR_FAIL_NULL_MSG(data.parent, "Node needs a parent to be reparented.");
+	ERR_FAIL_COND_MSG(p_parent == this, vformat("Can't reparent '%s' to itself.", p_parent->get_name()));
 
 
 	if (p_parent == data.parent) {
 	if (p_parent == data.parent) {
 		return;
 		return;