luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/Irrlicht/CMeshTextureLoader.cpp
View File

@@ -50,7 +50,7 @@ irr::video::ITexture* CMeshTextureLoader::getTexture(const irr::io::path& textur
// Pre-process texture filename.
irr::io::path simplifiedTexName(textureName);
simplifiedTexName.replace(_IRR_TEXT('\\'),_IRR_TEXT('/'));
simplifiedTexName.replace(IRR_TEXT('\\'),IRR_TEXT('/'));
// user defined texture path
if ( !TexturePath.empty() )
@@ -106,7 +106,7 @@ irr::video::ITexture* CMeshTextureLoader::getTexture(const irr::io::path& textur
if ( checkTextureName(FileSystem->getFileBasename(simplifiedTexName)) )
return VideoDriver->getTexture(TextureName);
TextureName = _IRR_TEXT("");
TextureName = IRR_TEXT("");
return NULL;
}
@@ -115,7 +115,7 @@ void CMeshTextureLoader::setMeshFile(const irr::io::IReadFile* meshFile)
{
// no grab (would need a weak_ptr)
MeshFile = meshFile;
MeshPath = _IRR_TEXT(""); // do a lazy evaluation later
MeshPath = IRR_TEXT(""); // do a lazy evaluation later
}
//! Meshloaders will try to look relative to the path of the materialFile
@@ -123,7 +123,7 @@ void CMeshTextureLoader::setMaterialFile(const irr::io::IReadFile* materialFile)
{
// no grab (would need a weak_ptr)
MaterialFile = materialFile;
MaterialPath = _IRR_TEXT(""); // do a lazy evaluation later
MaterialPath = IRR_TEXT(""); // do a lazy evaluation later
}
} // end namespace scnene