Merge branch 'master' into kimkulling-patch-8

code/AssetLib/Obj/ObjFileMtlImporter.cpp

@@ -137,10 +137,14 @@ void ObjFileMtlImporter::load() {
             } break;
             case 'T': {
                 ++m_DataIt;
-                if (*m_DataIt == 'f') // Material transmission
-                {
+                // Material transmission color
+                if (*m_DataIt == 'f')  {
                     ++m_DataIt;
                     getColorRGBA(&m_pModel->m_pCurrentMaterial->transparent);
+                } else if (*m_DataIt == 'r')  {
+                    // Material transmission alpha value
+                    ++m_DataIt;
+                    getFloatValue(m_pModel->m_pCurrentMaterial->alpha);                    
                 }
                 m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine);
             } break;

code/Material/MaterialSystem.cpp

@@ -402,7 +402,7 @@ aiMaterial::~aiMaterial() {
 }
 
 // ------------------------------------------------------------------------------------------------
-aiString aiMaterial::GetName() {
+aiString aiMaterial::GetName() const {
     aiString name;
     Get(AI_MATKEY_NAME, name);
 

include/assimp/material.inl

@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2020, assimp team
 
-
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,