diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-09-03 23:24:55 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-09-03 23:24:55 -0300 |
| commit | b0aa49accbd7e45dae38f1bd43b0fbdd11714211 (patch) | |
| tree | f9173780301097b0da9bba0203402c33036ea72d /core/variant.cpp | |
| parent | 7900d5daf21434a9396894a7c3ac360c03938770 (diff) | |
| download | redot-engine-b0aa49accbd7e45dae38f1bd43b0fbdd11714211.tar.gz | |
merged some stuff for okam
Diffstat (limited to 'core/variant.cpp')
| -rw-r--r-- | core/variant.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index e0bceb4dd8..c6a55b10e6 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -1592,9 +1592,17 @@ Variant::operator String() const { } break; case OBJECT: { - if (_get_obj().obj) + if (_get_obj().obj) { + #ifdef DEBUG_ENABLED + if (ScriptDebugger::get_singleton() && _get_obj().ref.is_null()) { + //only if debugging! + if (!ObjectDB::instance_validate(_get_obj().obj)) { + return "[Deleted Object]"; + }; + }; + #endif return "["+_get_obj().obj->get_type()+":"+itos(_get_obj().obj->get_instance_ID())+"]"; - else + } else return "[Object:null]"; } break; |