diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-18 16:17:33 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-18 16:17:33 -0300 |
| commit | 4661a6e126f03efcb7b41196d2fca9c9564123c6 (patch) | |
| tree | 663af68e5a123d9f58afba400df72c850ccf448e /modules/gdscript | |
| parent | fdaa2920eb21fff3320a17e9239e04dfadecdb00 (diff) | |
-try to avoid errors when path using ".." is present in script include, fixes #1703
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gd_compiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp index d19a881085..dbe5f28336 100644 --- a/modules/gdscript/gd_compiler.cpp +++ b/modules/gdscript/gd_compiler.cpp @@ -1386,7 +1386,7 @@ Error GDCompiler::_parse_class(GDScript *p_script,GDScript *p_owner,const GDPars _set_error("Could not resolve relative path for parent class: "+path,p_class); return ERR_FILE_NOT_FOUND; } - path=base.get_base_dir().plus_file(path); + path=base.get_base_dir().plus_file(path).simplify_path(); } script = ResourceLoader::load(path); if (script.is_null()) { |