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

2014-02-17 08:49:43 +01:00
parent 9b25749536 c158638d67
commit b75f27492a
1 changed files with 1 additions and 0 deletions
--- a/code/FBXConverter.cpp
+++ b/code/FBXConverter.cpp
@@ -1517,6 +1517,7 @@ private:
 		TrySetTextureProperties(out_mat, textures, "DisplacementColor", aiTextureType_DISPLACEMENT);
 		TrySetTextureProperties(out_mat, textures, "NormalMap", aiTextureType_NORMALS);
 		TrySetTextureProperties(out_mat, textures, "Bump", aiTextureType_HEIGHT);
+		TrySetTextureProperties(out_mat, textures, "ShininessExponent", aiTextureType_SHININESS);
 	}