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

Merge pull request #22201 from DualMatrix/error_spam_2_electric_boogaloo

Browse source 
Fixed error spam in remote debugger
This commit is contained in:
Rémi Verschelde 2018-09-20 14:45:21 +02:00 committed by GitHub
commit c19dc39630
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/script_debugger_remote.cpp
View file

@ -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);

14
editor/script_editor_debugger.cpp
View file

@ -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;
} }