Merge branch 'master' into preserve_error_string

2019-12-02 10:35:29 +00:00
parent 6f7cb6af06 6117c3f589
commit 631da3a3d1
46 changed files with 4770 additions and 2759 deletions
--- a/test/unit/utglTF2ImportExport.cpp
+++ b/test/unit/utglTF2ImportExport.cpp
@@ -405,6 +405,13 @@ TEST_F(utglTF2ImportExport, incorrect_vertex_arrays) {
    EXPECT_EQ(scene->mMeshes[7]->mNumFaces, 17u);
 }

+TEST_F( utglTF2ImportExport, texture_transform_test ) {
+	Assimp::Importer importer;
+	const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/glTF2/textureTransform/TextureTransformTest.gltf",
+			aiProcess_ValidateDataStructure);
+	EXPECT_NE(nullptr, scene);
+}
+
 #ifndef ASSIMP_BUILD_NO_EXPORT
 TEST_F( utglTF2ImportExport, exportglTF2FromFileTest ) {
    EXPECT_TRUE( exporterTest() );