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

Fix non ISO compliant use of ternary operator. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@653 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-04-06 00:26:27 +00:00
parent 3c03e0fca5
commit 4d2d4a64e0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/COBLoader.cpp
View File

@ -335,9 +335,15 @@ aiNode* COBImporter::BuildNodes(const Node& root,const Scene& scin,aiScene* fill
mat->AddProperty(&c,1,AI_MATKEY_COLOR_AMBIENT);
// convert textures if some exist.
min->tex_color ? ConvertTexture(min->tex_color,mat,aiTextureType_DIFFUSE) : 0;
min->tex_env ? ConvertTexture(min->tex_env ,mat,aiTextureType_UNKNOWN) : 0;
min->tex_bump ? ConvertTexture(min->tex_bump ,mat,aiTextureType_HEIGHT ) : 0;
if(min->tex_color) {
ConvertTexture(min->tex_color,mat,aiTextureType_DIFFUSE);
}
if(min->tex_env) {
ConvertTexture(min->tex_env ,mat,aiTextureType_UNKNOWN);
}
if(min->tex_bump) {
ConvertTexture(min->tex_bump ,mat,aiTextureType_HEIGHT);
}
}
}
}