Skip to content

Commit a66bc02

Browse files
committed
Merge pull request godotengine#90598 from berarma/scene_tree_clean_up
Remove some unused SceneTree properties
2 parents 4bce45b + 0a68876 commit a66bc02

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

scene/main/scene_tree.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ void SceneTreeTimer::release_connections() {
120120
SceneTreeTimer::SceneTreeTimer() {}
121121

122122
void SceneTree::tree_changed() {
123-
tree_version++;
124123
emit_signal(tree_changed_name);
125124
}
126125

@@ -153,7 +152,6 @@ SceneTree::Group *SceneTree::add_to_group(const StringName &p_group, Node *p_nod
153152

154153
ERR_FAIL_COND_V_MSG(E->value.nodes.has(p_node), &E->value, "Already in group: " + p_group + ".");
155154
E->value.nodes.push_back(p_node);
156-
//E->value.last_tree_version=0;
157155
E->value.changed = true;
158156
return &E->value;
159157
}
@@ -476,8 +474,6 @@ void SceneTree::iteration_prepare() {
476474
}
477475

478476
bool SceneTree::physics_process(double p_time) {
479-
root_lock++;
480-
481477
current_frame++;
482478

483479
flush_transform_notifications();
@@ -501,7 +497,6 @@ bool SceneTree::physics_process(double p_time) {
501497
process_tweens(p_time, true);
502498

503499
flush_transform_notifications();
504-
root_lock--;
505500

506501
_flush_delete_queue();
507502
_call_idle_callbacks();
@@ -510,8 +505,6 @@ bool SceneTree::physics_process(double p_time) {
510505
}
511506

512507
bool SceneTree::process(double p_time) {
513-
root_lock++;
514-
515508
if (MainLoop::process(p_time)) {
516509
_quit = true;
517510
}
@@ -537,8 +530,6 @@ bool SceneTree::process(double p_time) {
537530
MessageQueue::get_singleton()->flush(); //small little hack
538531
flush_transform_notifications(); //transforms after world update, to avoid unnecessary enter/exit notifications
539532

540-
root_lock--;
541-
542533
_flush_delete_queue();
543534

544535
if (unlikely(pending_new_scene)) {

scene/main/scene_tree.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ class SceneTree : public MainLoop {
122122

123123
Window *root = nullptr;
124124

125-
uint64_t tree_version = 1;
126125
double physics_process_time = 0.0;
127126
double process_time = 0.0;
128127
bool accept_quit = true;
@@ -134,7 +133,6 @@ class SceneTree : public MainLoop {
134133
bool debug_navigation_hint = false;
135134
#endif
136135
bool paused = false;
137-
int root_lock = 0;
138136

139137
HashMap<StringName, Group> group_map;
140138
bool _quit = false;
@@ -165,7 +163,6 @@ class SceneTree : public MainLoop {
165163

166164
// Safety for when a node is deleted while a group is being called.
167165

168-
bool processing = false;
169166
int nodes_removed_on_group_call_lock = 0;
170167
HashSet<Node *> nodes_removed_on_group_call; // Skip erased nodes.
171168

0 commit comments

Comments
 (0)