From ba992ed22f310389d3e2301d4393bb898bf2728e Mon Sep 17 00:00:00 2001 From: "Hunt J. Sparra" <19802403+HuntJSparra@users.noreply.github.com> Date: Fri, 29 Nov 2024 23:34:52 -0500 Subject: [PATCH] Fix early exit once has_server_feature_callback is set; remove server feature warning due to consistent "fallthrough" features (e.g., OS-specific features) --- core/os/os.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/os/os.cpp b/core/os/os.cpp index 1e9dbd2a1845..59a0579ce36b 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -536,14 +536,9 @@ bool OS::has_feature(const String &p_feature) { return true; } - if (has_server_feature_callback) { - return has_server_feature_callback(p_feature); - } -#ifdef DEBUG_ENABLED - else if (is_stdout_verbose()) { - WARN_PRINT_ONCE("Server features cannot be checked before RenderingServer has been created. If you are checking a server feature, consider moving your OS::has_feature call after INITIALIZATION_LEVEL_SERVERS."); + if (has_server_feature_callback && has_server_feature_callback(p_feature)) { + return true; } -#endif if (ProjectSettings::get_singleton()->has_custom_feature(p_feature)) { return true;