asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #69252 from godotengine/revert-67831-scene-tree-fix-storing-removed-nodes

Browse source 
Revert "`SceneTree` Fix storing removed nodes to be skipped by the group calls"
This commit is contained in:
Rémi Verschelde 2022-11-27 18:22:22 +01:00 committed by GitHub
commit 860884bde7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scene/main/scene_tree.cpp
View file

@ -123,9 +123,6 @@ void SceneTree::tree_changed() {
void SceneTree::node_added(Node *p_node) {
emit_signal(node_added_name, p_node);
if (call_lock > 0) {
call_skip.erase(p_node->get_instance_id());
}
}
void SceneTree::node_removed(Node *p_node) {
@ -134,7 +131,7 @@ void SceneTree::node_removed(Node *p_node) {
}
emit_signal(node_removed_name, p_node);
if (call_lock > 0) {
call_skip.insert(p_node->get_instance_id());
call_skip.insert(p_node);
}
}
@ -264,7 +261,7 @@ void SceneTree::call_group_flagsp(uint32_t p_call_flags, const StringName &p_gro
if (p_call_flags & GROUP_CALL_REVERSE) {
for (int i = gr_node_count - 1; i >= 0; i--) {
if (call_lock && call_skip.has(gr_nodes[i]->get_instance_id())) {
if (call_lock && call_skip.has(gr_nodes[i])) {
continue;
}
@ -278,7 +275,7 @@ void SceneTree::call_group_flagsp(uint32_t p_call_flags, const StringName &p_gro
} else {
for (int i = 0; i < gr_node_count; i++) {
if (call_lock && call_skip.has(gr_nodes[i]->get_instance_id())) {
if (call_lock && call_skip.has(gr_nodes[i])) {
continue;
}
@ -317,7 +314,7 @@ void SceneTree::notify_group_flags(uint32_t p_call_flags, const StringName &p_gr
if (p_call_flags & GROUP_CALL_REVERSE) {
for (int i = gr_node_count - 1; i >= 0; i--) {
if (call_lock && call_skip.has(gr_nodes[i]->get_instance_id())) {
if (call_lock && call_skip.has(gr_nodes[i])) {
continue;
}
@ -330,7 +327,7 @@ void SceneTree::notify_group_flags(uint32_t p_call_flags, const StringName &p_gr
} else {
for (int i = 0; i < gr_node_count; i++) {
if (call_lock && call_skip.has(gr_nodes[i]->get_instance_id())) {
if (call_lock && call_skip.has(gr_nodes[i])) {
continue;
}
@ -368,7 +365,7 @@ void SceneTree::set_group_flags(uint32_t p_call_flags, const StringName &p_group
if (p_call_flags & GROUP_CALL_REVERSE) {
for (int i = gr_node_count - 1; i >= 0; i--) {
if (call_lock && call_skip.has(gr_nodes[i]->get_instance_id())) {
if (call_lock && call_skip.has(gr_nodes[i])) {
continue;
}
@ -381,7 +378,7 @@ void SceneTree::set_group_flags(uint32_t p_call_flags, const StringName &p_group
} else {
for (int i = 0; i < gr_node_count; i++) {
if (call_lock && call_skip.has(gr_nodes[i]->get_instance_id())) {
if (call_lock && call_skip.has(gr_nodes[i])) {
continue;
}
@ -857,7 +854,7 @@ void SceneTree::_notify_group_pause(const StringName &p_group, int p_notificatio
for (int i = 0; i < gr_node_count; i++) {
Node *n = gr_nodes[i];
if (call_lock && call_skip.has(n->get_instance_id())) {
if (call_lock && call_skip.has(n)) {
continue;
}
@ -907,7 +904,7 @@ void SceneTree::_call_input_pause(const StringName &p_group, CallInputType p_cal
}
Node *n = gr_nodes[i];
if (call_lock && call_skip.has(n->get_instance_id())) {
if (call_lock && call_skip.has(n)) {
continue;
}

2
scene/main/scene_tree.h
View file

@ -135,7 +135,7 @@ private:
// Safety for when a node is deleted while a group is being called.
int call_lock = 0;
HashSet<ObjectID> call_skip; // Skip erased nodes. Store ID instead of pointer to avoid false positives when node is freed and a new node is allocated at the pointed address.
HashSet<Node *> call_skip; // Skip erased nodes.
List<ObjectID> delete_queue;