From e1ac16498e51d03a0aac7de5fbbf04276a3cfd2e Mon Sep 17 00:00:00 2001 From: Luis Cuenca Date: Tue, 12 Sep 2017 20:19:44 -0700 Subject: [PATCH] Corrected Ubuntu Errors Corrected: -endif -extra qualification -invalid initialization of non-const reference --- libraries/fbx/src/GLTFReader.cpp | 3 ++- libraries/fbx/src/GLTFReader.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/fbx/src/GLTFReader.cpp b/libraries/fbx/src/GLTFReader.cpp index 3ff369ba28..2f852a8f19 100644 --- a/libraries/fbx/src/GLTFReader.cpp +++ b/libraries/fbx/src/GLTFReader.cpp @@ -304,8 +304,9 @@ bool GLTFReader::addImage(const QJsonObject& object) { bool GLTFReader::getIndexFromObject(const QJsonObject& object, const QString& field, int& outidx, QMap& defined) { QJsonObject subobject; + QMap tmpdefined; if (getObjectVal(object, field, subobject, defined)) { - return getIntVal(subobject, "index", outidx, QMap()); + return getIntVal(subobject, "index", outidx, tmpdefined); } return false; } diff --git a/libraries/fbx/src/GLTFReader.h b/libraries/fbx/src/GLTFReader.h index 1a23786023..120a6895b2 100644 --- a/libraries/fbx/src/GLTFReader.h +++ b/libraries/fbx/src/GLTFReader.h @@ -563,8 +563,8 @@ private: void retriangulate(const QVector& in_indices, const QVector& in_vertices, const QVector& in_normals, QVector& out_indices, QVector& out_vertices, QVector& out_normals); - std::tuple GLTFReader::requestData(QUrl& url); - QNetworkReply* GLTFReader::request(QUrl& url, bool isTest); + std::tuple requestData(QUrl& url); + QNetworkReply* request(QUrl& url, bool isTest); bool doesResourceExist(const QString& url); @@ -579,4 +579,4 @@ private: -#endif hifi_GLTFReader_h \ No newline at end of file +#endif //hifi_GLTFReader_h \ No newline at end of file