asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #22522 from DualMatrix/debugging_the_debugger_3

Browse source 
Fixed debugger showing wrong name for Objects.
This commit is contained in:
Rémi Verschelde 2018-09-29 22:43:41 +02:00 committed by GitHub
commit e1dc8e4e99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
editor/script_editor_debugger.cpp
View file

@ -577,12 +577,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
String hs = String(); String hs = String();
if (v.get_type() == Variant::OBJECT) { if (v.get_type() == Variant::OBJECT) {
v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
h = PROPERTY_HINT_OBJECT_ID; h = PROPERTY_HINT_OBJECT_ID;
v = ObjectDB::get_instance(Object::cast_to<EncodedObjectAsID>(v)->get_object_id()); hs = "Object";
String s = v;
s = s.replace("[", "");
hs = s.get_slice(":", 0);
v = s.get_slice(":", 1).to_int();
} }
variables->add_property("Locals/" + n, v, h, hs); variables->add_property("Locals/" + n, v, h, hs);
@ -599,12 +596,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
String hs = String(); String hs = String();
if (v.get_type() == Variant::OBJECT) { if (v.get_type() == Variant::OBJECT) {
v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
h = PROPERTY_HINT_OBJECT_ID; h = PROPERTY_HINT_OBJECT_ID;
v = ObjectDB::get_instance(Object::cast_to<EncodedObjectAsID>(v)->get_object_id()); hs = "Object";
String s = v;
s = s.replace("[", "");
hs = s.get_slice(":", 0);
v = s.get_slice(":", 1).to_int();
} }
variables->add_property("Members/" + n, v, h, hs); variables->add_property("Members/" + n, v, h, hs);
@ -621,12 +615,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
String hs = String(); String hs = String();
if (v.get_type() == Variant::OBJECT) { if (v.get_type() == Variant::OBJECT) {
v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
h = PROPERTY_HINT_OBJECT_ID; h = PROPERTY_HINT_OBJECT_ID;
v = ObjectDB::get_instance(Object::cast_to<EncodedObjectAsID>(v)->get_object_id()); hs = "Object";
String s = v;
s = s.replace("[", "");
hs = s.get_slice(":", 0);
v = s.get_slice(":", 1).to_int();
} }
variables->add_property("Globals/" + n, v, h, hs); variables->add_property("Globals/" + n, v, h, hs);