diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:33:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-23 09:33:53 +0200 |
| commit | ec2c6c0f13004bc1bba92f14443228778da287a0 (patch) | |
| tree | 5c4e2621091ad7bbd31e6ffb6a277c1aaee39b55 /src/plugins/sceneparsers/assimp | |
| parent | 5476bc6b4b6a12c921da502c24c4e078b04dd3b3 (diff) | |
| parent | 0e3d54f8d7f9be26687afebcc9f456e4cefc2357 (diff) | |
Merge remote-tracking branch 'origin/5.8' into devwip/particles
Change-Id: I4e1c528eb8e1c81aead51a5664635ca2becad397
Diffstat (limited to 'src/plugins/sceneparsers/assimp')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpio.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpio.cpp b/src/plugins/sceneparsers/assimp/assimpio.cpp index 65fa7b538..cc40fd1f7 100644 --- a/src/plugins/sceneparsers/assimp/assimpio.cpp +++ b/src/plugins/sceneparsers/assimp/assimpio.cpp @@ -301,6 +301,7 @@ QStringList AssimpIO::assimpSupportedFormats() formats.append(QStringLiteral("vta")); formats.append(QStringLiteral("x")); formats.append(QStringLiteral("xml")); + formats.append(QStringLiteral("fbx")); return formats; } |