summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-07-27 17:21:55 +0200
committerGitHub <noreply@github.com>2016-07-27 17:21:55 +0200
commit161e77471fe0733bde8c61fd3ecf29d9da9540cf (patch)
tree41d8884956693464cdab947fef6d41ecb59a6cce
parent542bd81e760c4fcd271e95120978f6ddfa730ad5 (diff)
parent2150855fafd76f881bf5b1389d7740216981aaf0 (diff)
Merge pull request #5936 from bojidar-bg/fix-empty-stringarray-read
Fix reading of empty StringArray-s in .tscn
-rw-r--r--core/variant_parser.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp
index dce873a306..023605a952 100644
--- a/core/variant_parser.cpp
+++ b/core/variant_parser.cpp
@@ -1233,7 +1233,9 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
}
get_token(p_stream,token,line,r_err_str);
- if (token.type!=TK_STRING) {
+ if (token.type==TK_PARENTHESIS_CLOSE) {
+ break;
+ } else if (token.type!=TK_STRING) {
r_err_str="Expected string";
return ERR_PARSE_ERROR;
}