Browse Source

FIX: gcc's complaints about OgreImporter.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@486 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
aramis_acg 16 years ago
parent
commit
35b7416437
1 changed files with 5 additions and 4 deletions
  1. 5 4
      code/OgreImporter.cpp

+ 5 - 4
code/OgreImporter.cpp

@@ -874,17 +874,18 @@ aiNode* OgreImporter::CreateAiNodeFromBone(int BoneId, const std::vector<Bone> &
 void Bone::CalculateWorldToBoneSpaceMatrix(vector<Bone> &Bones)
 {
 	//Calculate the matrix for this bone:
+	aiMatrix4x4 t0,t1;
 	if(-1==ParentId)
 	{
-		WorldToBoneSpace= aiMatrix4x4::Translation(Position, aiMatrix4x4())
-						* aiMatrix4x4::Rotation(RotationAngle, RotationAxis, aiMatrix4x4())
+		WorldToBoneSpace= aiMatrix4x4::Translation(Position, t0)
+						* aiMatrix4x4::Rotation(RotationAngle, RotationAxis, t1)
 						;
 	}
 	else
 	{
 		WorldToBoneSpace= Bones[ParentId].WorldToBoneSpace
-						* aiMatrix4x4::Translation(Position, aiMatrix4x4())
-						* aiMatrix4x4::Rotation(RotationAngle, RotationAxis, aiMatrix4x4())
+						* aiMatrix4x4::Translation(Position, t0)
+						* aiMatrix4x4::Rotation(RotationAngle, RotationAxis, t1)
 						;
 
 	}