summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-12-12 00:18:58 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-12-12 00:18:58 +0100
commitea15b4ad44bd7ebc33ca4b2fa746cc117d12f20c (patch)
tree9550e0b89750d841adbc02430fe534c1df5a762e
parent1f3c16dd1cd06e9d20df4c850467e9ae5d10cb84 (diff)
parent1de041511831a8a02c0b2681a925e50917331281 (diff)
downloadredot-engine-ea15b4ad44bd7ebc33ca4b2fa746cc117d12f20c.tar.gz
Merge pull request #85159 from KoBeWi/404_strikes_back
Don't abort loading when `ext_resource` is missing
-rw-r--r--core/variant/variant_parser.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/variant/variant_parser.cpp b/core/variant/variant_parser.cpp
index 86e7654090..e35751fd61 100644
--- a/core/variant/variant_parser.cpp
+++ b/core/variant/variant_parser.cpp
@@ -1026,7 +1026,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
Ref<Resource> res;
Error err = p_res_parser->ext_func(p_res_parser->userdata, p_stream, res, line, r_err_str);
if (err) {
- return err;
+ // If the file is missing, the error can be ignored.
+ if (err != ERR_FILE_NOT_FOUND && err != ERR_CANT_OPEN) {
+ return err;
+ }
}
value = res;