Merge pull request #22201 from DualMatrix/error_spam_2_electric_boogaloo
Fixed error spam in remote debugger
This commit is contained in:
commit
c19dc39630
2 changed files with 15 additions and 10 deletions
|
@ -662,11 +662,14 @@ void ScriptDebuggerRemote::_send_object_id(ObjectID p_id) {
|
||||||
prop.push_back(Variant());
|
prop.push_back(Variant());
|
||||||
} else {
|
} else {
|
||||||
prop.push_back(pi.hint);
|
prop.push_back(pi.hint);
|
||||||
if (res.is_null() || res->get_path().empty())
|
|
||||||
prop.push_back(pi.hint_string);
|
prop.push_back(pi.hint_string);
|
||||||
else
|
|
||||||
prop.push_back(String("RES:") + res->get_path());
|
|
||||||
prop.push_back(pi.usage);
|
prop.push_back(pi.usage);
|
||||||
|
if (!res.is_null()) {
|
||||||
|
var = String("PATH") + res->get_path();
|
||||||
|
} else if (var.get_type() == Variant::STRING) {
|
||||||
|
var = String("DATA") + var;
|
||||||
|
}
|
||||||
|
|
||||||
prop.push_back(var);
|
prop.push_back(var);
|
||||||
}
|
}
|
||||||
send_props.push_back(prop);
|
send_props.push_back(prop);
|
||||||
|
|
|
@ -492,17 +492,19 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
|
||||||
pinfo.usage = PropertyUsageFlags(int(prop[4]));
|
pinfo.usage = PropertyUsageFlags(int(prop[4]));
|
||||||
Variant var = prop[5];
|
Variant var = prop[5];
|
||||||
|
|
||||||
String hint_string = pinfo.hint_string;
|
|
||||||
if (hint_string.begins_with("RES:") && hint_string != "RES:") {
|
|
||||||
String path = hint_string.substr(4, hint_string.length());
|
|
||||||
var = ResourceLoader::load(path);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_new_object) {
|
if (is_new_object) {
|
||||||
//don't update.. it's the same, instead refresh
|
//don't update.. it's the same, instead refresh
|
||||||
debugObj->prop_list.push_back(pinfo);
|
debugObj->prop_list.push_back(pinfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (var.get_type() == Variant::STRING) {
|
||||||
|
String str = var;
|
||||||
|
var = str.substr(4, str.length());
|
||||||
|
|
||||||
|
if (str.begins_with("PATH"))
|
||||||
|
var = ResourceLoader::load(var);
|
||||||
|
}
|
||||||
|
|
||||||
debugObj->prop_values[pinfo.name] = var;
|
debugObj->prop_values[pinfo.name] = var;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue