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

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

View File

@@ -587,7 +587,10 @@ void Parser::ParseLV3MapBlock(Texture& map)
if(!ParseString(temp,"*MAP_CLASS"))
SkipToNextToken();
if (temp != "Bitmap")
{
DefaultLogger::get()->warn("ASE: Skipping unknown map type: " + temp);
parsePath = false;
}
continue;
}
// path to the texture
@@ -595,6 +598,15 @@ void Parser::ParseLV3MapBlock(Texture& map)
{
if(!ParseString(map.mMapName,"*BITMAP"))
SkipToNextToken();
if (map.mMapName == "None")
{
// Files with 'None' as map name are produced by
// an Maja to ASE exporter which name I forgot ..
DefaultLogger::get()->warn("ASE: Skipping invalid map entry");
map.mMapName = "";
}
continue;
}
// offset on the u axis