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

Merge pull request #1447 from Matter-and-Form/gltf1-color-import-fix 

[gltf1] Don’t ignore rgba(1,1,1,1) color properties
pull/1461/head
Kim Kulling 2017-09-19 15:40:00 +02:00 committed by GitHub
parent adec1b2175 3e8955faf5
commit 5c44776532
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/glTFImporter.cpp
View File

@ -174,9 +174,7 @@ inline void SetMaterialColorProperty(std::vector<int>& embeddedTexIdxs, Asset& r
else { else {
aiColor4D col; aiColor4D col;
CopyValue(prop.color, col); CopyValue(prop.color, col);
if (col.r != 1.f || col.g != 1.f || col.b != 1.f || col.a != 1.f) { mat->AddProperty(&col, 1, pKey, type, idx);
mat->AddProperty(&col, 1, pKey, type, idx);
}
} }
} }
@ -672,7 +670,7 @@ void glTFImporter::InternReadFile(const std::string& pFile, aiScene* pScene, IOS
//pScene->mFlags |= AI_SCENE_FLAGS_NON_VERBOSE_FORMAT; //pScene->mFlags |= AI_SCENE_FLAGS_NON_VERBOSE_FORMAT;
MakeVerboseFormatProcess process; MakeVerboseFormatProcess process;
process.Execute(pScene); process.Execute(pScene);
if (pScene->mNumMeshes == 0) { if (pScene->mNumMeshes == 0) {
pScene->mFlags |= AI_SCENE_FLAGS_INCOMPLETE; pScene->mFlags |= AI_SCENE_FLAGS_INCOMPLETE;