diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-08-08 11:18:08 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-08-08 11:18:08 -0300 |
| commit | c2e2f2e0aebf6342e6f18ae5d67b6a825590675a (patch) | |
| tree | 2c82368c139c3e8c6dda8a8ecdea92c032f6cdc7 /modules/gdscript/gd_parser.cpp | |
| parent | 0a139aaef9971416715375c813a51a1a451245e1 (diff) | |
| parent | af132adf94da56ff231ce6f69f8098666cf7d9b0 (diff) | |
Merge pull request #2282 from Ovnuniarchos/master
Bitmask editor and some CanvasItem documentation.
Diffstat (limited to 'modules/gdscript/gd_parser.cpp')
| -rw-r--r-- | modules/gdscript/gd_parser.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 755997ef31..f7aaaf7ee5 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -2315,6 +2315,17 @@ void GDParser::_parse_class(ClassNode *p_class) { case Variant::INT: { + if (tokenizer->get_token()==GDTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier()=="FLAGS") { + + current_export.hint=PROPERTY_HINT_ALL_FLAGS; + tokenizer->advance(); + if (tokenizer->get_token()!=GDTokenizer::TK_PARENTHESIS_CLOSE) { + _set_error("Expected ')' in hint."); + return; + } + break; + } + if (tokenizer->get_token()==GDTokenizer::TK_CONSTANT && tokenizer->get_token_constant().get_type()==Variant::STRING) { //enumeration current_export.hint=PROPERTY_HINT_ENUM; |