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

Merge pull request #11402 from huffman/fix/remove-fbxcpp

Browse source 
Remove FBX.cpp and other cleanup
This commit is contained in:
Clément Brisset 2017-09-19 13:54:50 -07:00 committed by GitHub
commit a6376fcc12
4 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/fbx/src/FBX.cpp
View file

@ -1,10 +0,0 @@
//
// FBX.cpp
// libraries/fbx/src
//
// Created by Ryan Huffman on 9/5/17.
// Copyright 2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//

1
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -194,7 +194,6 @@ NetworkTexturePointer TextureCache::getTexture(const QUrl& url, image::TextureUs
if (type == image::TextureUsage::CUBE_TEXTURE) {
QUrlQuery query { url.query() };
query.addQueryItem("skybox", "");
qDebug() << "Updating cubemap texture query from" << url.query() << "to" << query.toString();
modifiedUrl.setQuery(query.toString());
}
TextureExtra extra = { type, content, maxNumPixels };

1
libraries/networking/src/AssetClient.cpp
View file

@ -617,7 +617,6 @@ MessageID AssetClient::setBakingEnabled(const AssetPathList& paths, bool enabled
_pendingMappingRequests[assetServer][messageID] = callback;
return messageID;
}
}

2
libraries/networking/src/ResourceCache.cpp
View file

@ -734,9 +734,7 @@ void Resource::handleReplyFinished() {
qCDebug(networking).noquote() << QString("Request finished for %1%2").arg(_url.toDisplayString(), extraInfo);
auto relativePathURL = _request->getRelativePathUrl();
qDebug() << "Relative path is: " << relativePathURL;
if (!relativePathURL.isEmpty()) {
qDebug() << "setting effective path";
_effectiveBaseURL = relativePathURL;
}