godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #2282 from Ovnuniarchos/master

Browse Source 
Bitmask editor and some CanvasItem documentation.
This commit is contained in:
Juan Linietsky
2015-08-08 11:18:08 -03:00
parent 0a139aaef9 af132adf94
commit c2e2f2e0ae
4 changed files with 5996 additions and 6022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/gdscript/gd_parser.cpp
View File

@@ -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;