godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear owners when pruning even out of the tree

Browse Source
This commit is contained in:
Pedro J. Estébanez 2022-03-12 12:48:15 +01:00
parent eb36566c34
commit 0b650b3e41
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/main/node.cpp
View File

@ -252,7 +252,7 @@ void Node::_propagate_enter_tree() {
// enter groups
}
void Node::_propagate_after_exit_tree() {
void Node::_propagate_after_exit_branch(bool p_exiting_tree) {
// Clear owner if it was not part of the pruned branch
if (data.owner) {
bool found = false;
@ -275,11 +275,13 @@ void Node::_propagate_after_exit_tree() {
data.blocked++;
for (int i = 0; i < data.children.size(); i++) {
data.children[i]->_propagate_after_exit_tree();
data.children[i]->_propagate_after_exit_branch(p_exiting_tree);
}
data.blocked--;
emit_signal(SceneStringNames::get_singleton()->tree_exited);
if (p_exiting_tree) {
emit_signal(SceneStringNames::get_singleton()->tree_exited);
}
}
void Node::_propagate_exit_tree() {
@ -1265,9 +1267,7 @@ void Node::remove_child(Node *p_child) {
p_child->data.parent = nullptr;
p_child->data.pos = -1;
if (data.inside_tree) {
p_child->_propagate_after_exit_tree();
}
p_child->_propagate_after_exit_branch(data.inside_tree);
}
int Node::get_child_count() const {

2
scene/main/node.h
View File

@ -180,7 +180,7 @@ private:
void _propagate_enter_tree();
void _propagate_ready();
void _propagate_exit_tree();
void _propagate_after_exit_tree();
void _propagate_after_exit_branch(bool p_exiting_tree);
void _propagate_physics_interpolated(bool p_interpolated);
void _print_stray_nodes();
void _propagate_pause_owner(Node *p_owner);

4
scene/main/scene_tree.cpp
View File

@ -707,7 +707,7 @@ void SceneTree::finish() {
if (root) {
root->_set_tree(nullptr);
root->_propagate_after_exit_tree();
root->_propagate_after_exit_branch(true);
memdelete(root); //delete root
root = nullptr;
}
@ -2246,7 +2246,7 @@ SceneTree::SceneTree() {
SceneTree::~SceneTree() {
if (root) {
root->_set_tree(nullptr);
root->_propagate_after_exit_tree();
root->_propagate_after_exit_branch(true);
memdelete(root);
}