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

Merge pull request #69301 from KoBeWi/ERR_WHATEVER

Browse source 
Don't break parsing on missing resources
This commit is contained in:
Rémi Verschelde 2022-11-28 16:53:46 +01:00
commit 55dae30177
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/variant/variant_parser.cpp
View file

@ -1283,7 +1283,7 @@ Error VariantParser::_parse_dictionary(Dictionary &object, Stream *p_stream, int
Variant v;
err = parse_value(token, v, p_stream, line, r_err_str, p_res_parser);
if (err) {
if (err && err != ERR_FILE_MISSING_DEPENDENCIES) {
return err;
}
object[key] = v;

7
scene/resources/resource_format_text.cpp
View file

@ -144,6 +144,7 @@ Error ResourceLoaderText::_parse_ext_resource(VariantParser::Stream *p_stream, R
}
String id = token.value;
Error err = OK;
if (!ignore_resource_parsing) {
if (!ext_resources.has(id)) {
@ -163,7 +164,7 @@ Error ResourceLoaderText::_parse_ext_resource(VariantParser::Stream *p_stream, R
error = ERR_FILE_MISSING_DEPENDENCIES;
error_text = "[ext_resource] referenced nonexistent resource at: " + path;
_printerr();
return error;
err = error;
} else {
ResourceLoader::notify_dependency_error(local_path, path, type);
}
@ -175,7 +176,7 @@ Error ResourceLoaderText::_parse_ext_resource(VariantParser::Stream *p_stream, R
error = ERR_FILE_MISSING_DEPENDENCIES;
error_text = "[ext_resource] referenced non-loaded resource at: " + path;
_printerr();
return error;
err = error;
}
} else {
r_res = Ref<Resource>();
@ -187,7 +188,7 @@ Error ResourceLoaderText::_parse_ext_resource(VariantParser::Stream *p_stream, R
return ERR_PARSE_ERROR;
}
return OK;
return err;
}
Ref<PackedScene> ResourceLoaderText::_parse_node_tag(VariantParser::ResourceParser &parser) {