From a2c82051d4777daef553fe8dc339deadd346ea5e Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Sun, 27 Nov 2016 22:44:03 +0100 Subject: [PATCH 1/2] Update ObjFileMtlImporter.cpp Fixed grammar --- code/ObjFileMtlImporter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ObjFileMtlImporter.cpp b/code/ObjFileMtlImporter.cpp index f6dc739ab..555296b94 100644 --- a/code/ObjFileMtlImporter.cpp +++ b/code/ObjFileMtlImporter.cpp @@ -59,8 +59,8 @@ static const std::string DiffuseTexture = "map_Kd"; static const std::string AmbientTexture = "map_Ka"; static const std::string SpecularTexture = "map_Ks"; static const std::string OpacityTexture = "map_d"; -static const std::string EmmissiveTexture = "map_emissive"; -static const std::string EmmissiveTexture_1 = "map_Ke"; +static const std::string EmissiveTexture = "map_emissive"; +static const std::string EmissiveTexture_1 = "map_Ke"; static const std::string BumpTexture1 = "map_bump"; static const std::string BumpTexture2 = "map_Bump"; static const std::string BumpTexture3 = "bump"; From ff73821cea6cb92b651869aede3f85f642c219f6 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Wed, 7 Dec 2016 19:52:03 +0100 Subject: [PATCH 2/2] Update ObjFileMtlImporter.cpp --- code/ObjFileMtlImporter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ObjFileMtlImporter.cpp b/code/ObjFileMtlImporter.cpp index 555296b94..0a62a0c2c 100644 --- a/code/ObjFileMtlImporter.cpp +++ b/code/ObjFileMtlImporter.cpp @@ -323,11 +323,11 @@ void ObjFileMtlImporter::getTexture() { // Opacity texture out = & m_pModel->m_pCurrentMaterial->textureOpacity; clampIndex = ObjFile::Material::TextureOpacityType; - } else if (!ASSIMP_strincmp( pPtr, EmmissiveTexture.c_str(), static_cast(EmmissiveTexture.size()) ) ) { + } else if (!ASSIMP_strincmp( pPtr, EmissiveTexture.c_str(), static_cast(EmissiveTexture.size()) ) ) { // Emissive texture out = & m_pModel->m_pCurrentMaterial->textureEmissive; clampIndex = ObjFile::Material::TextureEmissiveType; - } else if ( !ASSIMP_strincmp( pPtr, EmmissiveTexture_1.c_str(), static_cast(EmmissiveTexture_1.size()) ) ) { + } else if ( !ASSIMP_strincmp( pPtr, EmissiveTexture_1.c_str(), static_cast(EmissiveTexture_1.size()) ) ) { // Emissive texture out = &m_pModel->m_pCurrentMaterial->textureEmissive; clampIndex = ObjFile::Material::TextureEmissiveType;