From c8dc1b687b672b9d19377898998142c139e1d6e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A4=C3=A4tt=C3=A4=20Antti?= Date: Mon, 10 Apr 2017 09:58:15 +0300 Subject: [PATCH] Add new version check to config.tests for assimp Qt3D expects new version of assimp. Use new animation stuff to check new version. Task-number: QTBUG-59121 Change-Id: I3988beaab5b7dac825c67a225f785130be99aad6 Reviewed-by: Oswald Buddenhagen Reviewed-by: Sean Harmer Reviewed-by: Shawn Rutledge --- config.tests/assimp/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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 #include #include +#include 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; }