Merge pull request #11447 from akien-mga/queue_delete

Let queue_free() work on nodes which are not in the scene tree

1 files changed, 5 insertions, 2 deletions

diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 319f123da9..0ab41b40d8 100755
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -2572,8 +2572,11 @@ void Node::print_stray_nodes() {
 
 void Node::queue_delete() {
 
-	ERR_FAIL_COND(!is_inside_tree());
-	get_tree()->queue_delete(this);
+	if (is_inside_tree()) {
+		get_tree()->queue_delete(this);
+	} else {
+		SceneTree::get_singleton()->queue_delete(this);
+	}
 }
 
 Array Node::_get_children() const {