History

simplified naming of zip folders

Elisa Lupin-Jimenez committed 8 years ago

Commit a54f4ec1 parent b6e75d11 file · +1 −6Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+1−6
@@ -6336,12 +6336,7 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo · 6335 unmodified lines
6336 QString mapping;6336 QString mapping;
6337 QString filename = filenameFromPath(path);6337 QString filename = filenameFromPath(path);
6338 if (isZip || isBlocks) {6338 if (isZip || isBlocks) {
6339 QString assetName;6339 QString assetName = zipFile.section("/", -1).remove(QRegExp("\.zip(.*)$"));
6340 if (isZip) {
6341 assetName = zipFile.section("/", -1).remove(".zip");
6342 } else if (isBlocks) {
6343 assetName = zipFile.section("/", -1).remove(".zip?noDownload=false");
6344 }
6345 QString assetFolder = path.section("model_repo/", -1);6340 QString assetFolder = path.section("model_repo/", -1);
6346 mapping = "/" + assetName + "/" + assetFolder;6341 mapping = "/" + assetName + "/" + assetFolder;
6347 } else {6342 } else {