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

Merge remote-tracking branch 'official/master' into contrib

pull/261/head
Léo Terziman 2014-02-17 08:49:43 +01:00
parent 9b25749536 c158638d67
commit b75f27492a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/FBXConverter.cpp
View File

@ -1517,6 +1517,7 @@ private:
TrySetTextureProperties(out_mat, textures, "DisplacementColor", aiTextureType_DISPLACEMENT); TrySetTextureProperties(out_mat, textures, "DisplacementColor", aiTextureType_DISPLACEMENT);
TrySetTextureProperties(out_mat, textures, "NormalMap", aiTextureType_NORMALS); TrySetTextureProperties(out_mat, textures, "NormalMap", aiTextureType_NORMALS);
TrySetTextureProperties(out_mat, textures, "Bump", aiTextureType_HEIGHT); TrySetTextureProperties(out_mat, textures, "Bump", aiTextureType_HEIGHT);
TrySetTextureProperties(out_mat, textures, "ShininessExponent", aiTextureType_SHININESS);
} }