Commit b8f8a5c2 authored by Anakin's avatar Anakin
Browse files

fixed the problem

parent 6ead5d7b
...@@ -43,7 +43,7 @@ private: ...@@ -43,7 +43,7 @@ private:
void readVertex(Segment* dataDestination, std::streampos position); void readVertex(Segment* dataDestination, std::streampos position);
void readUV(Segment* dataDestination, std::streampos position); void readUV(Segment* dataDestination, std::streampos position);
void loadTexture(QOpenGLTexture* destination, QString filepath); void loadTexture(QOpenGLTexture*& destination, QString filepath);
QMatrix4x4 getParentMatrix(std::string parent) const; QMatrix4x4 getParentMatrix(std::string parent) const;
QQuaternion getParentRotation(std::string parent) const; QQuaternion getParentRotation(std::string parent) const;
......
...@@ -622,7 +622,7 @@ void MshFile::readUV(Segment * dataDestination, std::streampos position) ...@@ -622,7 +622,7 @@ void MshFile::readUV(Segment * dataDestination, std::streampos position)
m_file.read(F2V(dataDestination->vertices[i].texCoord[j]), sizeof(float)); m_file.read(F2V(dataDestination->vertices[i].texCoord[j]), sizeof(float));
} }
void MshFile::loadTexture(QOpenGLTexture * destination, QString filepath) void MshFile::loadTexture(QOpenGLTexture *& destination, QString filepath)
{ {
bool loadSuccess(false); bool loadSuccess(false);
QImage img; QImage img;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment