Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

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;
 }