Skip to content

Commit

Permalink
Bugfix: Collada loader now reads scenes with translucent materials co…
Browse files Browse the repository at this point in the history
…rrectly again.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@365 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
  • Loading branch information
ulfjorensen committed Mar 12, 2009
1 parent de50bb9 commit 68d7e43
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions code/ColladaLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -747,25 +747,25 @@ void ColladaLoader::FillMaterials( const ColladaParser& pParser, aiScene* pScene
// add textures, if given
if( !effect.mTexAmbient.mName.empty())
/* It is merely a lightmap */
AddTexture( mat, pParser, effect, effect.mTexAmbient,aiTextureType_LIGHTMAP);
AddTexture( mat, pParser, effect, effect.mTexAmbient, aiTextureType_LIGHTMAP);

if( !effect.mTexEmissive.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexEmissive,aiTextureType_EMISSIVE);
AddTexture( mat, pParser, effect, effect.mTexEmissive, aiTextureType_EMISSIVE);

if( !effect.mTexSpecular.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexSpecular,aiTextureType_SPECULAR);
AddTexture( mat, pParser, effect, effect.mTexSpecular, aiTextureType_SPECULAR);

if( !effect.mTexDiffuse.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexDiffuse,aiTextureType_DIFFUSE);
AddTexture( mat, pParser, effect, effect.mTexDiffuse, aiTextureType_DIFFUSE);

if( !effect.mTexBump.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexBump,aiTextureType_HEIGHT);
AddTexture( mat, pParser, effect, effect.mTexBump, aiTextureType_HEIGHT);

if( !effect.mTexTransparent.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexBump,aiTextureType_OPACITY);
AddTexture( mat, pParser, effect, effect.mTexTransparent, aiTextureType_OPACITY);

if( !effect.mTexReflective.mName.empty())
AddTexture( mat, pParser, effect, effect.mTexReflective,aiTextureType_REFLECTION);
AddTexture( mat, pParser, effect, effect.mTexReflective, aiTextureType_REFLECTION);
}
}

Expand Down

0 comments on commit 68d7e43

Please sign in to comment.