Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -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 | ||