Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 00:57:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed returning a reference to a local variable

Browse source
This commit is contained in:
luiscuenca 2017-10-10 12:44:38 -07:00
parent a7a1329c5f
commit 25b419a1a1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -660,7 +660,7 @@ bool GLTFReader::parseGLTF(const QByteArray& model) {
return true; return true;
} }
const glm::mat4& GLTFReader::getModelTransform(const GLTFNode& node) { glm::mat4 GLTFReader::getModelTransform(const GLTFNode& node) {
glm::mat4 tmat = glm::mat4(1.0); glm::mat4 tmat = glm::mat4(1.0);
if (node.defined["matrix"] && node.matrix.size() == 16) { if (node.defined["matrix"] && node.matrix.size() == 16) {
@ -962,7 +962,7 @@ QNetworkReply* GLTFReader::request(QUrl& url, bool isTest) {
return netReply; // trying to sync later on. return netReply; // trying to sync later on.
} }
const FBXTexture& GLTFReader::getFBXTexture(const GLTFTexture& texture) { FBXTexture GLTFReader::getFBXTexture(const GLTFTexture& texture) {
FBXTexture fbxtex = FBXTexture(); FBXTexture fbxtex = FBXTexture();
fbxtex.texcoordSet = 0; fbxtex.texcoordSet = 0;

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

@ -712,7 +712,7 @@ private:
GLTFFile _file; GLTFFile _file;
QUrl _url; QUrl _url;
const glm::mat4& getModelTransform(const GLTFNode& node); glm::mat4 getModelTransform(const GLTFNode& node);
bool buildGeometry(FBXGeometry& geometry, const QUrl& url); bool buildGeometry(FBXGeometry& geometry, const QUrl& url);
bool parseGLTF(const QByteArray& model); bool parseGLTF(const QByteArray& model);
@ -779,7 +779,7 @@ private:
void setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& material); void setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& material);
const FBXTexture& getFBXTexture(const GLTFTexture& texture); FBXTexture getFBXTexture(const GLTFTexture& texture);
void fbxDebugDump(const FBXGeometry& fbxgeo); void fbxDebugDump(const FBXGeometry& fbxgeo);
}; };