Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors

This commit is contained in:
Angelo Scandaliato
2016-10-03 09:34:16 -07:00
40 changed files with 11351 additions and 210 deletions

View File

@@ -353,6 +353,8 @@ void glTFExporter::ExportMaterials()
GetMatColorOrTex(mat, m->specular, AI_MATKEY_COLOR_SPECULAR, aiTextureType_SPECULAR);
GetMatColorOrTex(mat, m->emission, AI_MATKEY_COLOR_EMISSIVE, aiTextureType_EMISSIVE);
m->transparent = mat->Get(AI_MATKEY_OPACITY, m->transparency) == aiReturn_SUCCESS && m->transparency != 1.0;
GetMatScalar(mat, m->shininess, AI_MATKEY_SHININESS);
}
}