Merge pull request #43788 from RandomShaper/ref_singleton

Make warning about Reference singletons more accurate

1 files changed, 3 insertions, 2 deletions

diff --git a/core/config/engine.cpp b/core/config/engine.cpp
index 8e2ab094b0..26f8cdf840 100644
--- a/core/config/engine.cpp
+++ b/core/config/engine.cpp
@@ -224,8 +224,9 @@ Engine::Singleton::Singleton(const StringName &p_name, Object *p_ptr) :
 		name(p_name),
 		ptr(p_ptr) {
 #ifdef DEBUG_ENABLED
-	if (Object::cast_to<Reference>(p_ptr)) {
-		ERR_PRINT("A class intended to be used as a singleton must *not* inherit from Reference.");
+	Reference *ref = Object::cast_to<Reference>(p_ptr);
+	if (ref && !ref->is_referenced()) {
+		WARN_PRINT("You must use Ref<> to ensure the lifetime of a Reference object intended to be used as a singleton.");
 	}
 #endif
 }