Skip to content

D
deprecated-irrlicht-mac
Commit 810f87e9 authored by hybrid's avatar hybrid
Browse files
Options

Missed a directory separator in b3d loader, thanks to Eigen for pointing this out. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2533 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 2fedaaac
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
source/Irrlicht/CB3DMeshFileLoader.cpp
View file @ 810f87e9
...@@ -913,8 +913,8 @@ void CB3DMeshFileLoader::loadTextures(SB3dMaterial& material) const ...@@ -913,8 +913,8 @@ void CB3DMeshFileLoader::loadTextures(SB3dMaterial& material) const
io::IFileSystem* fs = SceneManager->getFileSystem(); io::IFileSystem* fs = SceneManager->getFileSystem();
if (fs->existFile(B3dTexture->TextureName)) if (fs->existFile(B3dTexture->TextureName))
tex = SceneManager->getVideoDriver()->getTexture(B3dTexture->TextureName); tex = SceneManager->getVideoDriver()->getTexture(B3dTexture->TextureName);
else if (fs->existFile(fs->getFileDir(B3DFile->getFileName()) + fs->getFileBasename(B3dTexture->TextureName))) else if (fs->existFile(fs->getFileDir(B3DFile->getFileName()) +"/"+ fs->getFileBasename(B3dTexture->TextureName)))
tex = SceneManager->getVideoDriver()->getTexture(fs->getFileDir(B3DFile->getFileName()) + fs->getFileBasename(B3dTexture->TextureName)); tex = SceneManager->getVideoDriver()->getTexture(fs->getFileDir(B3DFile->getFileName()) +"/"+ fs->getFileBasename(B3dTexture->TextureName));
else else
tex = SceneManager->getVideoDriver()->getTexture(fs->getFileBasename(B3dTexture->TextureName)); tex = SceneManager->getVideoDriver()->getTexture(fs->getFileBasename(B3dTexture->TextureName));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment