godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

fix enum from preloaded script in export

Browse Source 
without triggering unnecessary reloads and parsing.
This commit is contained in:
x1212
2018-03-04 17:53:21 +01:00
parent e619727e99
commit d2dc8fd423
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/gdscript/gdscript_parser.cpp
View File

@@ -461,18 +461,21 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s
} else if (!for_completion || FileAccess::exists(path)) { } else if (!for_completion || FileAccess::exists(path)) {
res = ResourceLoader::load(path); res = ResourceLoader::load(path);
} }
if (!res.is_valid()) {
_set_error("Can't preload resource at path: " + path);
return NULL;
}
} else { } else {
if (!FileAccess::exists(path)) { if (!FileAccess::exists(path)) {
_set_error("Can't preload resource at path: " + path); _set_error("Can't preload resource at path: " + path);
return NULL; return NULL;
} else if (ScriptCodeCompletionCache::get_singleton()) {
res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path);
} }
} }
if (!res.is_valid()) {
_set_error("Can't preload resource at path: " + path);
return NULL;
}
if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) { if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
_set_error("Expected ')' after 'preload' path"); _set_error("Expected ')' after 'preload' path");
return NULL; return NULL;