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

Merge remote-tracking branch 'assimp/master' 

Conflicts:
	code/LWSLoader.cpp
pull/3/head
Gellule Xg 2011-12-11 15:36:03 -10:00
parent 9178570c4c 3aad6f8b6d
commit f53f55484e
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/LWSLoader.cpp
View File

@ -338,8 +338,8 @@ void LWSImporter::BuildGraph(aiNode* nd, LWS::NodeDesc& src, std::vector<Attachm
//Remove first node from obj (the old pivot), reset transform of second node (the mesh node) //Remove first node from obj (the old pivot), reset transform of second node (the mesh node)
aiNode* newRootNode = obj->mRootNode->mChildren[0]; aiNode* newRootNode = obj->mRootNode->mChildren[0];
free(obj->mRootNode->mChildren); obj->mRootNode->mChildren[0] = NULL;
free(obj->mRootNode); delete obj->mRootNode;
obj->mRootNode = newRootNode; obj->mRootNode = newRootNode;
obj->mRootNode->mTransformation.a4 = 0.0; obj->mRootNode->mTransformation.a4 = 0.0;
obj->mRootNode->mTransformation.b4 = 0.0; obj->mRootNode->mTransformation.b4 = 0.0;

12
workspaces/vc9/assimp.vcproj
View File

@ -2008,6 +2008,18 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="m3"
>
<File
RelativePath="..\..\code\M3Importer.cpp"
>
</File>
<File
RelativePath="..\..\code\M3Importer.h"
>
</File>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="postprocessing" Name="postprocessing"