From 1b282e0baff4e012ac7538e270d58303c5d6399b Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 29 Nov 2021 13:52:45 -0600 Subject: [PATCH] use internalname for terrain layers stops bugs like spaces in filenames and the like from occuring due to pointing right at the diffuse flat file name, as well as corruption from using a different diffuse in the material later (cherry picked from commit c1227dbdd0dd61c25970eeaac128c6cbe5d25947) --- Engine/source/terrain/terrFile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Engine/source/terrain/terrFile.cpp b/Engine/source/terrain/terrFile.cpp index 2ff9f6333..ca9985f5b 100644 --- a/Engine/source/terrain/terrFile.cpp +++ b/Engine/source/terrain/terrFile.cpp @@ -259,8 +259,7 @@ void TerrainFile::_initMaterialInstMapping() for( U32 i = 0; i < mMaterials.size(); ++ i ) { - Torque::Path path( mMaterials[ i ]->getDiffuseMap()); - mMaterialInstMapping.push_back( path.getFileName() ); + mMaterialInstMapping.push_back(mMaterials[i]->getInternalName()); } mMaterialInstMapping.mapMaterials();