Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 00:17:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

simplified naming of zip folders

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2017-11-20 14:02:46 -08:00
parent b6e75d1222
commit a54f4eca93
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -6336,12 +6336,7 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo
QString mapping; QString mapping;
QString filename = filenameFromPath(path); QString filename = filenameFromPath(path);
if (isZip || isBlocks) { if (isZip || isBlocks) {
QString assetName; QString assetName = zipFile.section("/", -1).remove(QRegExp("\.zip(.*)$"));
if (isZip) {
assetName = zipFile.section("/", -1).remove(".zip");
} else if (isBlocks) {
assetName = zipFile.section("/", -1).remove(".zip?noDownload=false");
}
QString assetFolder = path.section("model_repo/", -1); QString assetFolder = path.section("model_repo/", -1);
mapping = "/" + assetName + "/" + assetFolder; mapping = "/" + assetName + "/" + assetFolder;
} else { } else {