Resolve conflicts with master

1 files changed, 3 insertions, 9 deletions

diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp
index c4be102..43ea51e 100644
--- a/source/Irrlicht/COBJMeshFileLoader.cpp
+++ b/source/Irrlicht/COBJMeshFileLoader.cpp
@@ -24,23 +24,18 @@ namespace scene
 #endif

 

 //! Constructor

-COBJMeshFileLoader::COBJMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs)

-: SceneManager(smgr), FileSystem(fs)

+COBJMeshFileLoader::COBJMeshFileLoader(scene::ISceneManager* smgr)

+: SceneManager(smgr)

 {

 	#ifdef _DEBUG

 	setDebugName("COBJMeshFileLoader");

 	#endif

-

-	if (FileSystem)

-		FileSystem->grab();

 }

 

 

 //! destructor

 COBJMeshFileLoader::~COBJMeshFileLoader()

 {

-	if (FileSystem)

-		FileSystem->drop();

 }

 

 

@@ -76,7 +71,6 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 	u32 smoothingGroup=0;

 

 	const io::path fullName = file->getFileName();

-	const io::path relPath = FileSystem->getFileDir(fullName)+"/";

 

 	c8* buf = new c8[filesize];

 	memset(buf, 0, filesize);

@@ -230,7 +224,7 @@ IAnimatedMesh* COBJMeshFileLoader::createMesh(io::IReadFile* file)
 					v.Pos = vertexBuffer[Idx[0]];

 				else

 				{

-					os::Printer::log("Invalid vertex index in this line:", wordBuffer.c_str(), ELL_ERROR);

+					os::Printer::log("Invalid vertex index in this line", wordBuffer.c_str(), ELL_ERROR);

 					delete [] buf;

 					return 0;

 				}