From de476178cdd8a88c5b5159467b20404d83b173d7 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Mon, 20 Oct 2008 11:21:45 +0000 Subject: [PATCH] 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 --- code/PretransformVertices.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/PretransformVertices.cpp b/code/PretransformVertices.cpp index 34c2e677d..b8ed76ad1 100644 --- a/code/PretransformVertices.cpp +++ b/code/PretransformVertices.cpp @@ -93,7 +93,7 @@ unsigned int GetMeshVFormat(aiMesh* pcMesh) // from scratch. The pointer is unused as animations are lost // during PretransformVertices. if (pcMesh->mBones) - return (unsigned int)pcMesh->mBones; + return (unsigned int)(unsigned long)pcMesh->mBones; ai_assert(NULL != pcMesh->mVertices); @@ -123,7 +123,7 @@ unsigned int GetMeshVFormat(aiMesh* pcMesh) while (pcMesh->HasVertexColors(p))iRet |= (0x1000000 << p++); // store the value for later use - pcMesh->mBones = (aiBone**)iRet; + pcMesh->mBones = (aiBone**)(unsigned long)iRet; return iRet; }