Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small fix to the ASE loader - workaround for bitmaps with filename "None".

Browse Source 
Further work on the IRR loader. Still work in progress.
Fixed a minor issue in StandardShapes.
Fixed a bug in the Q3D loader causing models without textures to load incorrectly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@225 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-11-02 22:30:37 +00:00
parent df85f0aead
commit 240dbfd864
8 changed files with 249 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/StandardShapes.cpp
View File

@@ -166,12 +166,12 @@ aiMesh* StandardShapes::MakeMesh ( unsigned int (*GenerateFunc)(
}
// ------------------------------------------------------------------------------------------------
aiMesh* StandardShapes::MakeMesh ( unsigned int (*GenerateFunc)(
aiMesh* StandardShapes::MakeMesh (unsigned int num, void (*GenerateFunc)(
unsigned int,std::vector<aiVector3D>&))
{
std::vector<aiVector3D> temp;
unsigned num = (*GenerateFunc)(4,temp);
return MakeMesh(temp,num);
(*GenerateFunc)(num,temp);
return MakeMesh(temp,3);
}
// ------------------------------------------------------------------------------------------------