diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /config.tests/assimp/main.cpp | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'config.tests/assimp/main.cpp')
-rw-r--r-- | config.tests/assimp/main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config.tests/assimp/main.cpp b/config.tests/assimp/main.cpp index d367b0cd8..8d5e86f85 100644 --- a/config.tests/assimp/main.cpp +++ b/config.tests/assimp/main.cpp @@ -31,6 +31,7 @@ #include <assimp/postprocess.h> #include <assimp/Importer.hpp> #include <assimp/DefaultLogger.hpp> +#include <assimp/anim.h> int main(int , char **) { @@ -40,5 +41,9 @@ int main(int , char **) // SET THIS TO REMOVE POINTS AND LINES -> HAVE ONLY TRIANGLES importer.SetPropertyInteger(AI_CONFIG_PP_SBP_REMOVE, aiPrimitiveType_LINE|aiPrimitiveType_POINT); + // Check for new version by setting animation morph channels. + aiAnimation anim; + anim.mNumMorphMeshChannels = 0; + return 0; } |