summaryrefslogtreecommitdiffstats
path: root/core/os/os.cpp
diff options
context:
space:
mode:
authorSpartan322 <Megacake1234@gmail.com>2024-11-27 13:52:25 -0500
committerSpartan322 <Megacake1234@gmail.com>2024-11-27 13:52:25 -0500
commit721f53fde47c2727d99e3ecccdb789a67df36de0 (patch)
tree55ec5bfa061a5c27272b831e697b78ed1b756a70 /core/os/os.cpp
parentb06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e (diff)
parentf128f383e892865379cb8b14e7bcc9858efe2973 (diff)
downloadredot-engine-721f53fde47c2727d99e3ecccdb789a67df36de0.tar.gz
Merge commit godotengine/godot@f128f383e892865379cb8b14e7bcc9858efe2973
Diffstat (limited to 'core/os/os.cpp')
-rw-r--r--core/os/os.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 4b599c70ee..fda9cc5512 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -538,9 +538,14 @@ bool OS::has_feature(const String &p_feature) {
return true;
}
- if (has_server_feature_callback && has_server_feature_callback(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.");
}
+#endif
if (ProjectSettings::get_singleton()->has_custom_feature(p_feature)) {
return true;