summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-09-28 19:59:37 +0200
committerGitHub <noreply@github.com>2018-09-28 19:59:37 +0200
commitdea0f69296f248d3294bdf11bd77eba212ce7d6c (patch)
tree88684ac00870a467dbe0dfa39f1d3f103bb0b730 /editor
parentdacc3f33c5aae95eabfbe9fa69139c9b9f1af242 (diff)
parentd4df4c1475e5aedec43c7cfae752c1136ef22792 (diff)
Merge pull request #22517 from DualMatrix/debugging_the_debugger_2
Fixed Objects do not showing their drop down in debugger.
Diffstat (limited to 'editor')
-rw-r--r--editor/script_editor_debugger.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp
index cc477314e9..f13d3f5287 100644
--- a/editor/script_editor_debugger.cpp
+++ b/editor/script_editor_debugger.cpp
@@ -30,6 +30,7 @@
#include "script_editor_debugger.h"
+#include "core/io/marshalls.h"
#include "core/project_settings.h"
#include "core/ustring.h"
#include "editor_node.h"
@@ -577,6 +578,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
if (v.get_type() == Variant::OBJECT) {
h = PROPERTY_HINT_OBJECT_ID;
+ v = ObjectDB::get_instance(Object::cast_to<EncodedObjectAsID>(v)->get_object_id());
String s = v;
s = s.replace("[", "");
hs = s.get_slice(":", 0);
@@ -598,6 +600,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
if (v.get_type() == Variant::OBJECT) {
h = PROPERTY_HINT_OBJECT_ID;
+ v = ObjectDB::get_instance(Object::cast_to<EncodedObjectAsID>(v)->get_object_id());
String s = v;
s = s.replace("[", "");
hs = s.get_slice(":", 0);
@@ -619,6 +622,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
if (v.get_type() == Variant::OBJECT) {
h = PROPERTY_HINT_OBJECT_ID;
+ v = ObjectDB::get_instance(Object::cast_to<EncodedObjectAsID>(v)->get_object_id());
String s = v;
s = s.replace("[", "");
hs = s.get_slice(":", 0);