diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-09 04:23:59 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-09 04:23:59 +0400 |
| commit | e3488af838e6c43e5e3d9635d7604ab04f5a9b27 (patch) | |
| tree | 3105375f1c67c2e5b24815ee633e576eef3ad078 /source/blender/collada/DocumentImporter.cpp | |
| parent | deeeaed3d858cf8be7d9fba294e96db3778aa587 (diff) | |
fixed: [#34080] import of COLLADA breaks on '#' in filepath
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 835812fddbb..a234d85bc6f 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -131,7 +131,8 @@ bool DocumentImporter::import() // deselect all to select new objects BKE_scene_base_deselect_all(CTX_data_scene(mContext)); - if (!root.loadDocument(mFilename)) { + const std::string encodedFilename = bc_url_encode(mFilename); + if (!root.loadDocument(encodedFilename)) { fprintf(stderr, "COLLADAFW::Root::loadDocument() returned false on 1st pass\n"); return false; } @@ -146,7 +147,7 @@ bool DocumentImporter::import() COLLADASaxFWL::Loader loader2; COLLADAFW::Root root2(&loader2, this); - if (!root2.loadDocument(mFilename)) { + if (!root2.loadDocument(encodedFilename)) { fprintf(stderr, "COLLADAFW::Root::loadDocument() returned false on 2nd pass\n"); return false; } @@ -1235,3 +1236,4 @@ bool DocumentImporter::is_armature(COLLADAFW::Node *node){ return false; } + |