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

Clara download working again, still can drag in Blocks zip

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2017-07-28 15:13:24 -07:00
parent 9d2be28a8a
commit 692aa4c4b9
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -6267,14 +6267,12 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBloc
// Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
QString mapping; QString mapping;
QString path = filePath; QString path = filePath;
QString filename = filenameFromPath(filePath); QString filename = filenameFromPath(path);
if (isBlocks) { if (isBlocks) {
QString assetFolder = zipFile.section("/", -1); QString assetFolder = zipFile.section("/", -1);
assetFolder.remove(".zip"); assetFolder.remove(".zip");
mapping = "/" + assetFolder + "/" + filenameFromPath(filename); mapping = "/" + assetFolder + "/" + filename;
} else { } else {
path = QUrl(filePath).toLocalFile();
filename = filenameFromPath(path);
mapping = "/" + filename; mapping = "/" + filename;
} }