Merge branch 'master' into gltf2_sparseAccessor_import

pull/3219/head
Kim Kulling 2020-05-26 21:30:51 +02:00 committed by GitHub
commit 2c9cfefe67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 1712 deletions

File diff suppressed because it is too large Load Diff

View File

@ -98,13 +98,6 @@ void RemoveVCProcessTest::SetUp() {
pScene->mCameras = new aiCamera *[pScene->mNumCameras = 2]; pScene->mCameras = new aiCamera *[pScene->mNumCameras = 2];
pScene->mCameras[0] = new aiCamera(); pScene->mCameras[0] = new aiCamera();
pScene->mCameras[1] = new aiCamera(); pScene->mCameras[1] = new aiCamera();
// COMPILE TEST: aiMaterial may no add any extra members,
// so we don't need a virtual destructor
char check[sizeof(aiMaterial) == sizeof(aiMaterial) ? 10 : -1];
check[0] = 0;
// to remove compiler warning
EXPECT_EQ(0, check[0]);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------

View File

@ -462,7 +462,7 @@ int CDisplay::AddTextureToDisplayList(unsigned int iType,
TVINSERTSTRUCT sNew; TVINSERTSTRUCT sNew;
tvi.pszText = chTemp; tvi.pszText = chTemp;
tvi.cchTextMax = (int)strlen(chTemp); tvi.cchTextMax = (int)strlen(chTemp);
tvi.mask = TVIF_TEXT | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_HANDLE | TVIF_HANDLE; tvi.mask = TVIF_TEXT | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_HANDLE;
tvi.lParam = (LPARAM)20; tvi.lParam = (LPARAM)20;
// find out whether this is the default texture or not // find out whether this is the default texture or not