Resolve conflicts with master

1 files changed, 1 insertions, 18 deletions

diff --git a/source/Irrlicht/CSceneManager.h b/source/Irrlicht/CSceneManager.h
index caf9dbe..4b1beec 100644
--- a/source/Irrlicht/CSceneManager.h
+++ b/source/Irrlicht/CSceneManager.h
@@ -31,17 +31,12 @@ namespace scene
 	public:

 

 		//! constructor

-		CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,

-			gui::ICursorControl* cursorControl, IMeshCache* cache = 0,

-			gui::IGUIEnvironment *guiEnvironment = 0);

+		CSceneManager(video::IVideoDriver* driver, gui::ICursorControl* cursorControl, IMeshCache* cache = 0);

 

 		//! destructor

 		virtual ~CSceneManager();

 

 		//! gets an animateable mesh. loads it if needed. returned pointer must not be dropped.

-		IAnimatedMesh* getMesh(const io::path& filename, const io::path& alternativeCacheName) override;

-

-		//! gets an animateable mesh. loads it if needed. returned pointer must not be dropped.

 		IAnimatedMesh* getMesh(io::IReadFile* file) override;

 

 		//! Returns an interface to the mesh cache which is shared between all existing scene managers.

@@ -50,12 +45,6 @@ namespace scene
 		//! returns the video driver

 		video::IVideoDriver* getVideoDriver() override;

 

-		//! return the gui environment

-		gui::IGUIEnvironment* getGUIEnvironment() override;

-

-		//! return the filesystem

-		io::IFileSystem* getFileSystem() override;

-

 		//! adds a scene node for rendering an animated mesh model

 		virtual IAnimatedMeshSceneNode* addAnimatedMeshSceneNode(IAnimatedMesh* mesh, ISceneNode* parent=0, s32 id=-1,

 			const core::vector3df& position = core::vector3df(0,0,0),

@@ -282,12 +271,6 @@ namespace scene
 		//! video driver

 		video::IVideoDriver* Driver;

 

-		//! file system

-		io::IFileSystem* FileSystem;

-

-		//! GUI Enviroment ( Debug Purpose )

-		gui::IGUIEnvironment* GUIEnvironment;

-

 		//! cursor control

 		gui::ICursorControl* CursorControl;