v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fbx_export_animation

pull/1857/head
Kim Kulling 2018-03-27 21:44:06 +02:00 committed by GitHub
parent e972b73fc2 359f54f6ca
commit 2e5055efbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit/utMetadata.cpp
View File

@ -199,7 +199,7 @@ TEST_F( utMetadata, copy_test ) {
m_data->Set( 6, "aiVector3D", vecVal ); m_data->Set( 6, "aiVector3D", vecVal );
aiMetadata copy( *m_data ); aiMetadata copy( *m_data );
EXPECT_EQ( 7, copy.mNumProperties ); EXPECT_EQ( 7u, copy.mNumProperties );
// bool test // bool test
{ {

8
test/unit/utPLYImportExport.cpp
View File

@ -132,10 +132,10 @@ TEST_F( utPLYImportExport, vertexColorTest ) {
EXPECT_EQ(true, scene->mMeshes[0]->HasVertexColors(0)); EXPECT_EQ(true, scene->mMeshes[0]->HasVertexColors(0));
auto first_face = scene->mMeshes[0]->mFaces[0]; auto first_face = scene->mMeshes[0]->mFaces[0];
EXPECT_EQ(3, first_face.mNumIndices); EXPECT_EQ(3u, first_face.mNumIndices);
EXPECT_EQ(0, first_face.mIndices[0]); EXPECT_EQ(0u, first_face.mIndices[0]);
EXPECT_EQ(1, first_face.mIndices[1]); EXPECT_EQ(1u, first_face.mIndices[1]);
EXPECT_EQ(2, first_face.mIndices[2]); EXPECT_EQ(2u, first_face.mIndices[2]);
} }
//Test issue #623, PLY importer should not automatically create faces //Test issue #623, PLY importer should not automatically create faces