Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-04 12:49:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Delete Default-Sky-9-cubemap.texmeta

Browse source
This commit is contained in:
Sam Gondelman 2018-10-09 10:37:20 -07:00 committed by SamGondelman
parent 49553e0285
commit 121fc7205c
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
interface/resources/images/Default-Sky-9-cubemap/Default-Sky-9-cubemap.texmeta
View file

2
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -650,7 +650,7 @@ void DefaultLightingSetup::run(const RenderContextPointer& renderContext) {
if (!_defaultSkyboxNetworkTexture) { if (!_defaultSkyboxNetworkTexture) {
PROFILE_RANGE(render, "Process Default Skybox"); PROFILE_RANGE(render, "Process Default Skybox");
_defaultSkyboxNetworkTexture = DependencyManager::get<TextureCache>()->getTexture( _defaultSkyboxNetworkTexture = DependencyManager::get<TextureCache>()->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()) { if (_defaultSkyboxNetworkTexture && _defaultSkyboxNetworkTexture->isLoaded() && _defaultSkyboxNetworkTexture->getGPUTexture()) {

2
libraries/shared/src/PathUtils.cpp
View file

@ -132,8 +132,6 @@ QUrl PathUtils::expandToLocalDataAbsolutePath(const QUrl& fileUrl) {
return expandedURL; return expandedURL;
} }
QUrl::fromLocalFile(resourcesPath()).toString();
return fileUrl; return fileUrl;
} }