From 121fc7205c1021cf2d9c5ece984b33aa0f7a84e0 Mon Sep 17 00:00:00 2001 From: Sam Gondelman Date: Tue, 9 Oct 2018 10:37:20 -0700 Subject: [PATCH] Delete Default-Sky-9-cubemap.texmeta --- .../images/Default-Sky-9-cubemap/Default-Sky-9-cubemap.texmeta | 0 libraries/render-utils/src/DeferredLightingEffect.cpp | 2 +- libraries/shared/src/PathUtils.cpp | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 interface/resources/images/Default-Sky-9-cubemap/Default-Sky-9-cubemap.texmeta diff --git a/interface/resources/images/Default-Sky-9-cubemap/Default-Sky-9-cubemap.texmeta b/interface/resources/images/Default-Sky-9-cubemap/Default-Sky-9-cubemap.texmeta deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index f4cc4987db..11202efa1e 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -650,7 +650,7 @@ void DefaultLightingSetup::run(const RenderContextPointer& renderContext) { if (!_defaultSkyboxNetworkTexture) { PROFILE_RANGE(render, "Process Default Skybox"); _defaultSkyboxNetworkTexture = DependencyManager::get()->getTexture( - PathUtils::resourcesPath() + "images/Default-Sky-9-cubemap/Default-Sky-9-cubemap.texmeta.json", image::TextureUsage::CUBE_TEXTURE); + PathUtils::resourcesUrl() + "images/Default-Sky-9-cubemap/Default-Sky-9-cubemap.texmeta.json", image::TextureUsage::CUBE_TEXTURE); } if (_defaultSkyboxNetworkTexture && _defaultSkyboxNetworkTexture->isLoaded() && _defaultSkyboxNetworkTexture->getGPUTexture()) { diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index e66121f159..60b426e46d 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -132,8 +132,6 @@ QUrl PathUtils::expandToLocalDataAbsolutePath(const QUrl& fileUrl) { return expandedURL; } - QUrl::fromLocalFile(resourcesPath()).toString(); - return fileUrl; }