Merge branch 'master' into issue_1089

2016-12-02 14:31:18 +01:00
parent dcfc696e86 c46ac37c9b
commit 769805efd0
12 changed files with 357 additions and 103 deletions
--- a/code/ObjFileParser.cpp
+++ b/code/ObjFileParser.cpp
@@ -587,7 +587,7 @@ void ObjFileParser::getMaterialLib() {
        DefaultLogger::get()->info("OBJ: Opening fallback material file " + strMatFallbackName);
        pFile = m_pIO->Open(strMatFallbackName);
        if (!pFile) {
-            DefaultLogger::get()->error("OBJ: Unable to locate fallback material file " + strMatName);
+            DefaultLogger::get()->error("OBJ: Unable to locate fallback material file " + strMatFallbackName);
            m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine);
            return;
        }