浏览代码

Merge pull request #22522 from DualMatrix/debugging_the_debugger_3

Fixed debugger showing wrong name for Objects.
Rémi Verschelde 7 年之前
父节点
当前提交
e1dc8e4e99
共有 1 个文件被更改,包括 6 次插入15 次删除
  1. 6 15
      editor/script_editor_debugger.cpp

+ 6 - 15
editor/script_editor_debugger.cpp

@@ -577,12 +577,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
 			String hs = String();
 
 			if (v.get_type() == Variant::OBJECT) {
+				v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
 				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);
-				v = s.get_slice(":", 1).to_int();
+				hs = "Object";
 			}
 
 			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();
 
 			if (v.get_type() == Variant::OBJECT) {
+				v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
 				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);
-				v = s.get_slice(":", 1).to_int();
+				hs = "Object";
 			}
 
 			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();
 
 			if (v.get_type() == Variant::OBJECT) {
+				v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
 				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);
-				v = s.get_slice(":", 1).to_int();
+				hs = "Object";
 			}
 
 			variables->add_property("Globals/" + n, v, h, hs);