mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-30 21:33:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9015 from mcanders/mcanders/ParseObjectVariantFix

Browse Source 
Fix Variant::OBJECT token parsing
This commit is contained in:
Rémi Verschelde 2017-06-07 07:51:32 +02:00 committed by GitHub
commit 71ada5bc2c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/variant_parser.cpp
View File

@ -744,7 +744,12 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
return err;
if (token.type == TK_PARENTHESIS_CLOSE) {
Reference *reference = obj->cast_to<Reference>();
if (reference) {
value = REF(reference);
} else {
value = obj;
}
return OK;
}
@ -760,7 +765,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
}
}
get_token(p_stream, token, line, r_err_str);
if (token.type != TK_STRING) {
r_err_str = "Expected property name as string";
return ERR_PARSE_ERROR;