diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-22 09:24:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-22 09:24:57 +0100 |
| commit | 520b9823954628f66b256bcf6e0c96f30ed4f625 (patch) | |
| tree | aa8cb07880d8c96b1020bfd8dd43c9dc7bcd8df5 /src/plugins/sceneparsers | |
| parent | f91ee783c5704b0d55da0d96dacf6eca8933e748 (diff) | |
| parent | 9409dd81287af75108023abbd66e49e07ba65de6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/render/backend/renderer.cpp
Change-Id: I691f54cd6daef8a966df37d447164c94badce34c
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 5af2104c5..a2264964c 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 |