diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 12:02:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-14 12:47:58 +0100 |
| commit | 1382b0cfb336cc04924d61b46f0b69dadb1c3d39 (patch) | |
| tree | f7b5d12a0475d9d4ee5d4ba17fd02dc36ae96b97 /src/plugins/sceneparsers | |
| parent | f76259554244bf3fa3045e58c1f59f3eac1b6a03 (diff) | |
| parent | 31f424bb81cd2583920d3d521e1e01f01c2d28e2 (diff) | |
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Conflicts:
src/render/backend/renderer.cpp
src/render/backend/renderer_p.h
tests/auto/render/renderer/tst_renderer.cpp
Done-with: Svenn-Arne Dragly <svenn-arne.dragly@qt.io>
Change-Id: I2ca9bac4777e51434579edf86030414734f533ac
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 e630ce657..219a75ce4 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp +++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp @@ -616,6 +616,7 @@ void AssimpImporter::readSceneFile(const QString &path) */ void AssimpImporter::readSceneData(const QByteArray& data, const QString &basePath) { + Q_UNUSED(basePath); cleanup(); m_scene = new SceneImporter(); |