From 8c288918a0b02606e13be0e75dd9dd278764d2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Thu, 1 Jun 2023 11:03:32 +0200 Subject: [PATCH] Remove redundant check from thread guards --- scene/main/node.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scene/main/node.h b/scene/main/node.h index 35748d63b78..e848ab112af 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -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; } }