godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

-try to avoid errors when path using ".." is present in script include, fixes #1703

Browse Source
This commit is contained in:
Juan Linietsky
2015-04-18 16:17:33 -03:00
parent fdaa2920eb
commit 4661a6e126
12 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gd_compiler.cpp
View File

@@ -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()) {