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

Corrected Ubuntu Errors

Browse source 
Corrected:
-endif
-extra qualification
-invalid initialization of non-const reference
This commit is contained in:
Luis Cuenca 2017-09-12 20:19:44 -07:00
parent d7c525cf3a
commit e1ac16498e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/fbx/src/GLTFReader.cpp
View file

@ -304,8 +304,9 @@ bool GLTFReader::addImage(const QJsonObject& object) {
bool GLTFReader::getIndexFromObject(const QJsonObject& object, const QString& field, int& outidx, QMap<QString, bool>& defined) {
QJsonObject subobject;
QMap<QString, bool> tmpdefined;
if (getObjectVal(object, field, subobject, defined)) {
return getIntVal(subobject, "index", outidx, QMap<QString, bool>());
return getIntVal(subobject, "index", outidx, tmpdefined);
}
return false;
}

6
libraries/fbx/src/GLTFReader.h
View file

@ -563,8 +563,8 @@ private:
void retriangulate(const QVector<int>& in_indices, const QVector<glm::vec3>& in_vertices, const QVector<glm::vec3>& in_normals,
QVector<int>& out_indices, QVector<glm::vec3>& out_vertices, QVector<glm::vec3>& out_normals);
std::tuple<bool, QByteArray> GLTFReader::requestData(QUrl& url);
QNetworkReply* GLTFReader::request(QUrl& url, bool isTest);
std::tuple<bool, QByteArray> requestData(QUrl& url);
QNetworkReply* request(QUrl& url, bool isTest);
bool doesResourceExist(const QString& url);
@ -579,4 +579,4 @@ private:
#endif hifi_GLTFReader_h
#endif //hifi_GLTFReader_h