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

Merge pull request #1146 from elect86/patch-4 

Update PlyLoader.cpp
pull/1147/head
Alexander Gessler 2017-01-20 00:08:06 +01:00 committed by GitHub
parent 57975cb007 821e9fb0b8
commit 8748c6f4b6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/PlyLoader.cpp
View File

@ -1074,7 +1074,7 @@ void PLYImporter::LoadMaterial(std::vector<aiMaterial*>* pvOut)
pcHelper->AddProperty<aiColor4D>(&clrOut,1,AI_MATKEY_COLOR_AMBIENT);
// handle phong power and shading mode
int iMode;
int iMode = (int)aiShadingMode_Gouraud;
if (0xFFFFFFFF != iPhong) {
ai_real fSpec = PLY::PropertyInstance::ConvertTo<ai_real>(GetProperty((*i).alProperties, iPhong).avList.front(),ePhong);
@ -1087,9 +1087,7 @@ void PLYImporter::LoadMaterial(std::vector<aiMaterial*>* pvOut)
iMode = (int)aiShadingMode_Phong;
}
else iMode = (int)aiShadingMode_Gouraud;
}
else iMode = (int)aiShadingMode_Gouraud;
pcHelper->AddProperty<int>(&iMode, 1, AI_MATKEY_SHADING_MODEL);
// handle opacity