فهرست منبع

# fix vc10 compilation issue, thanks for Stepan Hrbek for the patch.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@993 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
aramis_acg 14 سال پیش
والد
کامیت
6a9e0f57d4
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      code/DeboneProcess.cpp

+ 2 - 2
code/DeboneProcess.cpp

@@ -155,7 +155,7 @@ void DeboneProcess::Execute( aiScene* pScene)
 			}
 			else	{
 				// Mesh is kept unchanged - store it's new place in the mesh array
-				mSubMeshIndices[a].push_back(std::pair<unsigned int,aiNode*>(meshes.size(),0));
+				mSubMeshIndices[a].push_back(std::pair<unsigned int,aiNode*>(meshes.size(),(aiNode*)0));
 				meshes.push_back(srcMesh);
 			}
 		}	
@@ -343,7 +343,7 @@ void DeboneProcess::SplitMesh( const aiMesh* pMesh, std::vector< std::pair< aiMe
 		}
 
 		aiMesh *baseMesh = MakeSubmesh(pMesh,subFaces,0);
-		std::pair<aiMesh*,const aiBone*> push_pair(baseMesh,0);
+		std::pair<aiMesh*,const aiBone*> push_pair(baseMesh,(const aiBone*)0);
 
 		poNewMeshes.push_back(push_pair);
 	}