diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 22:57:24 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 22:57:24 -0300 |
| commit | 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b (patch) | |
| tree | b6d3a290333c72940b49ed4c930ff6858a59515e /tools/collada/collada.cpp | |
| parent | a65edb4caabec21654c56552e11aacf0fd9291de (diff) | |
| download | redot-engine-31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b.tar.gz | |
-fix bug in cache for atlas import/export
-fix some menus
-fixed bug in out transition curves
-detect and remove file:/// in collada
-remove multiscript for now
-remove dependencies on mouse in OS, moved to Input
-avoid fscache from screwing up (fix might make it slower, but it works)
-funcref was missing, it's there now
Diffstat (limited to 'tools/collada/collada.cpp')
| -rw-r--r-- | tools/collada/collada.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/collada/collada.cpp b/tools/collada/collada.cpp index 66e5e3f0e6..0d02c32d00 100644 --- a/tools/collada/collada.cpp +++ b/tools/collada/collada.cpp @@ -344,6 +344,9 @@ void Collada::_parse_image(XMLParser& parser) { // path is relative to file being loaded, so convert to a resource path path=Globals::get_singleton()->localize_path(state.local_path.get_base_dir()+"/"+path); + } else if (path.find("file:///")==0) { + path=path.replace_first("file:///",""); + path=Globals::get_singleton()->localize_path(path); } image.path=path; |
