Merge commit '6d630bec50fe7767296b0e5184a9c6c7b915df24' into contrib

code/BlenderScene.cpp

@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief MACHINE GENERATED BY ./scripts/BlenderImporter/genblenddna.py
  */
 #include "AssimpPCH.h"
-#ifndef AI_BUILD_NO_BLEND_IMPORTER
+#ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER
 
 #include "BlenderDNA.h"
 #include "BlenderScene.h"

code/ObjFileData.h

@@ -156,6 +156,7 @@ struct Material
 	aiString texture;
 	aiString textureSpecular;
 	aiString textureAmbient;
+	aiString textureEmissive;
 	aiString textureBump;
 	aiString textureNormal;
 	aiString textureSpecularity;
@@ -166,6 +167,7 @@ struct Material
 		TextureDiffuseType = 0,
 		TextureSpecularType,
 		TextureAmbientType,
+		TextureEmissiveType,
 		TextureBumpType,
 		TextureNormalType,
 		TextureSpecularityType,

code/ObjFileImporter.cpp

@@ -575,6 +575,9 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
 			}
 		}
 
+		if ( 0 != pCurrentMaterial->textureEmissive.length )
+			mat->AddProperty( &pCurrentMaterial->textureEmissive, AI_MATKEY_TEXTURE_EMISSIVE(0));
+
 		if ( 0 != pCurrentMaterial->textureSpecular.length )
 		{
 			mat->AddProperty( &pCurrentMaterial->textureSpecular, AI_MATKEY_TEXTURE_SPECULAR(0));

code/ObjFileMtlImporter.cpp

@@ -302,6 +302,10 @@ void ObjFileMtlImporter::getTexture() {
 		// Ambient texture
 		out = & m_pModel->m_pCurrentMaterial->textureAmbient;
 		clampIndex = ObjFile::Material::TextureAmbientType;
+	} else if (!ASSIMP_strincmp(&(*m_DataIt),"map_emissive",6)) {
+		// Emissive texture
+		out = & m_pModel->m_pCurrentMaterial->textureEmissive;
+		clampIndex = ObjFile::Material::TextureEmissiveType;
 	} else if ( !ASSIMP_strincmp( pPtr, BumpTexture1.c_str(), BumpTexture1.size() ) ||
 		        !ASSIMP_strincmp( pPtr, BumpTexture2.c_str(), BumpTexture2.size() ) || 
 		        !ASSIMP_strincmp( pPtr, BumpTexture3.c_str(), BumpTexture3.size() ) ) {