History

Clara download working again, still can drag in Blocks zip

Elisa Lupin-Jimenez committed 9 years ago

Commit 692aa4c1 parent 9d2be281 file · +2 −4Browse files

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

Unified · Split

interface/src/Application.cpp+2−4
@@ -6267,14 +6267,12 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool isBloc · 6266 unmodified lines
6267 // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().6267 // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
6268 QString mapping;6268 QString mapping;
6269 QString path = filePath;6269 QString path = filePath;
6270 QString filename = filenameFromPath(filePath);6270 QString filename = filenameFromPath(path);
6271 if (isBlocks) {6271 if (isBlocks) {
6272 QString assetFolder = zipFile.section("/", -1);6272 QString assetFolder = zipFile.section("/", -1);
6273 assetFolder.remove(".zip");6273 assetFolder.remove(".zip");
6274 mapping = "/" + assetFolder + "/" + filenameFromPath(filename);6274 mapping = "/" + assetFolder + "/" + filename;
6275 } else {6275 } else {
6276 path = QUrl(filePath).toLocalFile();
6277 filename = filenameFromPath(path);
6278 mapping = "/" + filename;6276 mapping = "/" + filename;
6279 }6277 }
6280 6278

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t