mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-23 23:15:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77724 from RandomShaper/remove_red_th_cond

Browse Source 
Remove redundant check from thread guards
This commit is contained in:
Rémi Verschelde 2023-06-01 15:52:16 +02:00
commit 2e273f0e35
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scene/main/node.h
View File

@ -541,19 +541,22 @@ public:
}
_FORCE_INLINE_ bool is_accessible_from_caller_thread() const {
if (current_process_thread_group == nullptr) {
// Not thread processing. Only accessible if node is outside the scene tree,
// if accessing from the main thread or being loaded.
// No thread processing.
// Only accessible if node is outside the scene tree
// or access will happen from a node-safe thread.
return !data.inside_tree || is_current_thread_safe_for_nodes();
} else {
// Thread processing
// Thread processing.
return current_process_thread_group == data.process_thread_group_owner;
}
}
_FORCE_INLINE_ bool is_readable_from_caller_thread() const {
if (current_process_thread_group == nullptr) {
return Thread::is_main_thread() || is_current_thread_safe_for_nodes();
// No thread processing.
return is_current_thread_safe_for_nodes();
} else {
// Thread processing.
return true;
}
}