summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers
diff options
context:
space:
mode:
authorLee Helpingstine <khelping@ford.com>2019-02-08 10:04:50 -0500
committerSean Harmer <sean.harmer@kdab.com>2019-02-08 21:57:32 +0000
commit52c3f9ab735bf0dfe611402ea456afc56ccdeb37 (patch)
treea0faed66247624889b1eaab9bb06c68cecec5d09 /src/plugins/sceneparsers
parent0247b3ba4fa15c0b697c9b3b0829b5d1c9a50892 (diff)
Fix Assimp scene loader plugin resource paths
Assimp is passing us DOS style paths and failing to load resources in a QRC. Replacing \\ with / allows them to be loaded on all platforms. Change-Id: I086a158a9b2f3f8dcbc0ebfc082471b515e74820 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers')
-rw-r--r--src/plugins/sceneparsers/assimp/assimpimporter.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
index a91bc268d..ef28c577f 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
@@ -164,6 +164,7 @@ QMaterial *createBestApproachingMaterial(const aiMaterial *assimpMaterial)
QString texturePath(const aiString &path)
{
QString p = aiStringToQString(path);
+ p.replace(QLatin1String("\\"), QLatin1String("/"));
if (p.startsWith('/'))
p.remove(0, 1);
return p;