diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-30 15:12:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 15:12:04 +0200 |
| commit | 737f09895d24cfd267018bdea2c67c1a4ddd20a6 (patch) | |
| tree | eb2c4179e6b6e8c0719a968a672496decc618fe7 /modules/gdscript/gdscript_compiler.cpp | |
| parent | 89637e45f83a0121bdb1d086a359ce11d981dd8f (diff) | |
| parent | 2b9be53243e868a03894ffe8637c9983e7f0255f (diff) | |
Merge pull request #47131 from vnen/gdscript-export-fix
Fix a few issues with @export in GDScript
Diffstat (limited to 'modules/gdscript/gdscript_compiler.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_compiler.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp index 22380d152e..62bb6a9f9e 100644 --- a/modules/gdscript/gdscript_compiler.cpp +++ b/modules/gdscript/gdscript_compiler.cpp @@ -137,16 +137,12 @@ GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::D } } } break; + case GDScriptParser::DataType::ENUM: case GDScriptParser::DataType::ENUM_VALUE: result.has_type = true; result.kind = GDScriptDataType::BUILTIN; result.builtin_type = Variant::INT; break; - case GDScriptParser::DataType::ENUM: - result.has_type = true; - result.kind = GDScriptDataType::BUILTIN; - result.builtin_type = Variant::DICTIONARY; - break; case GDScriptParser::DataType::UNRESOLVED: { ERR_PRINT("Parser bug: converting unresolved type."); return GDScriptDataType(); @@ -2218,9 +2214,8 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptPar prop_info.hint = export_info.hint; prop_info.hint_string = export_info.hint_string; prop_info.usage = export_info.usage; - } else { - prop_info.usage = PROPERTY_USAGE_SCRIPT_VARIABLE; } + prop_info.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE; #ifdef TOOLS_ENABLED p_script->doc_variables[name] = variable->doc_description; #endif |