diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-08 14:16:51 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-08 14:16:51 +0200 |
| commit | 2349ba61a8b379906f733e893f4f5e5c08c1cf24 (patch) | |
| tree | 05e03f658a19656bf5ee8628a06dec83142ffec2 /src/plugins/sceneparsers/assimp/assimpimporter.h | |
| parent | bb0f4b48390b5ddc9758f04f6ecd692072fb279f (diff) | |
| parent | 4a2d8d6ee54976e3a8e2218bc8e97c857688cdfe (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.9.0
Conflicts:
src/render/geometry/buffer.cpp
Change-Id: If4d28a1e4c95cbd8e81b1751eed3214952516d8c
Diffstat (limited to 'src/plugins/sceneparsers/assimp/assimpimporter.h')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpimporter.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.h b/src/plugins/sceneparsers/assimp/assimpimporter.h index 7335830f5..e37950981 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.h +++ b/src/plugins/sceneparsers/assimp/assimpimporter.h @@ -143,7 +143,6 @@ private: QMap<uint, QMaterial*> m_materials; QMap<uint, QEffect *> m_effects; QMap<uint, QAbstractTexture *> m_embeddedTextures; - QMap<QString, QAbstractTexture *> m_materialTextures; QMap<aiNode*, Qt3DCore::QEntity*> m_cameras; QHash<aiTextureType, QString> m_textureToParameterName; QVector<Qt3DAnimation::QKeyframeAnimation *> m_animations; |