From 68d7e43056635866c1a31eeec51e0d2e32f39600 Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Thu, 12 Mar 2009 14:15:57 +0000 Subject: [PATCH] Bugfix: Collada loader now reads scenes with translucent materials correctly again. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@365 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/ColladaLoader.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index 23ef44339..7782069bb 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -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); } }