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

Added cast to unsigned long in PretransformVertices.cpp. Hopefully this fixes the compiler issues with GCC4 on linux. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@190 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2008-10-20 11:21:45 +00:00
parent 8271164d74
commit de476178cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/PretransformVertices.cpp
View File

@ -93,7 +93,7 @@ unsigned int GetMeshVFormat(aiMesh* pcMesh)
// from scratch. The pointer is unused as animations are lost // from scratch. The pointer is unused as animations are lost
// during PretransformVertices. // during PretransformVertices.
if (pcMesh->mBones) if (pcMesh->mBones)
return (unsigned int)pcMesh->mBones; return (unsigned int)(unsigned long)pcMesh->mBones;
ai_assert(NULL != pcMesh->mVertices); ai_assert(NULL != pcMesh->mVertices);
@ -123,7 +123,7 @@ unsigned int GetMeshVFormat(aiMesh* pcMesh)
while (pcMesh->HasVertexColors(p))iRet |= (0x1000000 << p++); while (pcMesh->HasVertexColors(p))iRet |= (0x1000000 << p++);
// store the value for later use // store the value for later use
pcMesh->mBones = (aiBone**)iRet; pcMesh->mBones = (aiBone**)(unsigned long)iRet;
return iRet; return iRet;
} }