Merge remote-tracking branch 'upstream/master' into feat/mocha-tests

This commit is contained in:
Par Winzell 2018-12-19 22:28:35 -08:00
commit 366971e521
1 changed files with 3 additions and 3 deletions

View File

@ -255,11 +255,11 @@ static void ReadMesh(
RawShadingModel shadingModel; RawShadingModel shadingModel;
if (fbxMaterial->shadingModel == "Lambert") { if (fbxMaterial->shadingModel == "Lambert") {
shadingModel = RAW_SHADING_MODEL_LAMBERT; shadingModel = RAW_SHADING_MODEL_LAMBERT;
} else if (fbxMaterial->shadingModel == "Blinn") { } else if (0 == fbxMaterial->shadingModel.CompareNoCase("Blinn")) {
shadingModel = RAW_SHADING_MODEL_BLINN; shadingModel = RAW_SHADING_MODEL_BLINN;
} else if (fbxMaterial->shadingModel == "Phong") { } else if (0 == fbxMaterial->shadingModel.CompareNoCase("Phong")) {
shadingModel = RAW_SHADING_MODEL_PHONG; shadingModel = RAW_SHADING_MODEL_PHONG;
} else if (fbxMaterial->shadingModel == "Constant") { } else if (0 == fbxMaterial->shadingModel.CompareNoCase("Constant")) {
shadingModel = RAW_SHADING_MODEL_PHONG; shadingModel = RAW_SHADING_MODEL_PHONG;
} else { } else {
shadingModel = RAW_SHADING_MODEL_UNKNOWN; shadingModel = RAW_SHADING_MODEL_UNKNOWN;