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

fix font import path on windows, closes #1675

Browse Source
This commit is contained in:
Juan Linietsky
2015-05-04 15:06:41 -03:00
parent fbbe7dcdfb
commit 2a02d3f96f
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/ustring.cpp
View File

@@ -3297,8 +3297,11 @@ String String::path_to_file(const String& p_path) const {
String src=this->replace("\\","/").get_base_dir();
String dst=p_path.replace("\\","/").get_base_dir();
return src.path_to(dst)+p_path.get_file();
String rel = src.path_to(dst);
if (rel==dst) // failed
return p_path;
else
return rel+p_path.get_file();
}
String String::path_to(const String& p_path) const {
@@ -3333,7 +3336,9 @@ String String::path_to(const String& p_path) const {
String src_begin=src.get_slice("/",0);
String dst_begin=dst.get_slice("/",0);
ERR_FAIL_COND_V(src_begin!=dst_begin,p_path); //return dst absolute path
if (src_begin!=dst_begin)
return p_path; //impossible to do this
base=src_begin;
src=src.substr(src_begin.length(),src.length());
dst=dst.substr(dst_begin.length(),dst.length());