diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-09 19:08:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 19:08:07 +0100 |
| commit | 478337c412f767b908820d7bb56c786bf0b909cb (patch) | |
| tree | 019ee1871f24bed0b9c56391830a48583dd15a54 /core/variant.cpp | |
| parent | 640169da5b20538c2d5c1106957461a3c988e2bc (diff) | |
| parent | 3b47eb51e4025fae6dd63eb405dee54c49281a5f (diff) | |
Merge pull request #36751 from Faless/debugger/threads_and_profilers
ScriptDebugger refactor, threading, profilers.
Diffstat (limited to 'core/variant.cpp')
| -rw-r--r-- | core/variant.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 550974363b..b82602a5a4 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -31,6 +31,7 @@ #include "variant.h" #include "core/core_string_names.h" +#include "core/debugger/engine_debugger.h" #include "core/io/marshalls.h" #include "core/math/math_funcs.h" #include "core/print_string.h" @@ -2221,7 +2222,7 @@ Variant::operator RID() const { return RID(); } else if (type == OBJECT && _get_obj().obj) { #ifdef DEBUG_ENABLED - if (ScriptDebugger::get_singleton()) { + if (EngineDebugger::is_active()) { ERR_FAIL_COND_V_MSG(ObjectDB::get_instance(_get_obj().id) == nullptr, RID(), "Invalid pointer (object was freed)."); }; #endif |