diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp index 7a30a33c673..22e9fe31b5f 100644 --- a/core/script_debugger_remote.cpp +++ b/core/script_debugger_remote.cpp @@ -567,22 +567,46 @@ void ScriptDebuggerRemote::_send_object_id(ObjectID p_id) { if (ScriptInstance *si = obj->get_script_instance()) { if (!si->get_script().is_null()) { - Set members; - si->get_script()->get_members(&members); - for (Set::Element *E = members.front(); E; E = E->next()) { + typedef Map > ScriptMemberMap; + typedef Map > ScriptConstantsMap; - Variant m; - if (si->get(E->get(), m)) { - PropertyInfo pi(m.get_type(), String("Members/") + E->get()); - properties.push_back(PropertyDesc(pi, m)); + ScriptMemberMap members; + members[si->get_script().ptr()] = Set(); + si->get_script()->get_members(&(members[si->get_script().ptr()])); + + ScriptConstantsMap constants; + constants[si->get_script().ptr()] = Map(); + si->get_script()->get_constants(&(constants[si->get_script().ptr()])); + + Ref