Merge branch 'master' into remove_ctest

2018-01-06 21:31:22 +01:00
parent 2f6dab53f4 e8fffb7815
commit b2bfb40859
11 changed files with 91 additions and 63 deletions
--- a/test/models/FBX/box.fbx
+++ b/test/models/FBX/box.fbx
--- a/test/unit/utFBXImporterExporter.cpp
+++ b/test/unit/utFBXImporterExporter.cpp
@@ -61,3 +61,9 @@ public:
 TEST_F( utFBXImporterExporter, importXFromFileTest ) {
    EXPECT_TRUE( importerTest() );
 }
+
+TEST_F( utFBXImporterExporter, importBareBoxWithoutColorsAndTextureCoords ) {
+    Assimp::Importer importer;
+    const aiScene *scene = importer.ReadFile( ASSIMP_TEST_MODELS_DIR "/FBX/box.fbx", aiProcess_ValidateDataStructure );
+    EXPECT_NE( nullptr, scene );
+}