diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-15 22:13:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 22:13:36 +0200 |
| commit | 12e22f004ac66e41914f97610dd962865dabb2a4 (patch) | |
| tree | d021e05d8375d4bd6b37d153701c4fe7876fe616 /modules | |
| parent | 3a6711f8d604becf8f795eef920cc4384067d133 (diff) | |
| parent | 3ed92311175bb7024d7b51e7c70acbeaaf0b4947 (diff) | |
Merge pull request #21044 from willnationsdev/class_icons
Fix error spam from loading script class icons
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gdscript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 8cf7121630..b987d2897f 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -1877,7 +1877,7 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b } } if (r_icon_path) { - if (c->icon_path.is_abs_path()) + if (c->icon_path.empty() || c->icon_path.is_abs_path()) *r_icon_path = c->icon_path; else if (c->icon_path.is_rel_path()) *r_icon_path = p_path.get_base_dir().plus_file(c->icon_path).simplify_path(); |