diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-22 13:21:04 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-22 14:08:36 +0100 |
| commit | 598acd70a44f787a3e72c586576bfc028d5af02d (patch) | |
| tree | 30691da4bbdb935dbf592d9689d034060b9d4d74 /src/plugins/sceneparsers | |
| parent | 32a511a667bab93d4fca2e71b38d89f8d76aa07c (diff) | |
| parent | 2b19bde378e084331b1b7ba9aa076270492999bb (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/render/backend/renderer_p.h
src/render/geometry/geometryrenderer.cpp
src/render/geometry/qmesh.cpp
src/render/geometry/qmesh_p.h
tests/auto/render/commons/testrenderer.h
tests/auto/render/meshfunctors/tst_meshfunctors.cpp
tests/auto/render/qmesh/tst_qmesh.cpp
Change-Id: Ia078029e2faf23fe253c5ce385e393c094266e3b
Diffstat (limited to 'src/plugins/sceneparsers')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpimporter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp index 66446ced5..e630ce657 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp +++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp @@ -1290,6 +1290,7 @@ void AssimpImporter::copyMaterialTextures(QMaterial *material, aiMaterial *assim QAbstractTexture *tex = QAbstractNodeFactory::createNode<QTexture2D>("QTexture2D"); QTextureImage *texImage = QAbstractNodeFactory::createNode<QTextureImage>("QTextureImage"); texImage->setSource(QUrl::fromLocalFile(fullPath)); + texImage->setMirrored(false); tex->addTextureImage(texImage); // Set proper wrapping mode |