asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #25650 from willnationsdev/script-icon

Browse source 
Fix script class icons looking for paths at runtime
This commit is contained in:
Rémi Verschelde 2019-02-09 12:22:51 +01:00 committed by GitHub
commit 6c243326bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/gdscript/gdscript_parser.cpp
View file

@ -3494,16 +3494,20 @@ void GDScriptParser::_parse_class(ClassNode *p_class) {
tokenizer->advance(); tokenizer->advance();
if ((tokenizer->get_token() == GDScriptTokenizer::TK_CONSTANT && tokenizer->get_token_constant().get_type() == Variant::STRING)) { if ((tokenizer->get_token() == GDScriptTokenizer::TK_CONSTANT && tokenizer->get_token_constant().get_type() == Variant::STRING)) {
Variant constant = tokenizer->get_token_constant(); #ifdef TOOLS_ENABLED
String icon_path = constant.operator String(); if (Engine::get_singleton()->is_editor_hint()) {
Variant constant = tokenizer->get_token_constant();
String icon_path = constant.operator String();
String abs_icon_path = icon_path.is_rel_path() ? self_path.get_base_dir().plus_file(icon_path).simplify_path() : icon_path; String abs_icon_path = icon_path.is_rel_path() ? self_path.get_base_dir().plus_file(icon_path).simplify_path() : icon_path;
if (!FileAccess::exists(abs_icon_path)) { if (!FileAccess::exists(abs_icon_path)) {
_set_error("No class icon found at: " + abs_icon_path); _set_error("No class icon found at: " + abs_icon_path);
return; return;
}
p_class->icon_path = icon_path;
} }
#endif
p_class->icon_path = icon_path;
tokenizer->advance(); tokenizer->advance();
} else { } else {