diff options
| author | numzero <numzer0@yandex.ru> | 2023-03-25 10:42:11 +0300 |
|---|---|---|
| committer | numzero <numzer0@yandex.ru> | 2023-03-25 10:42:47 +0300 |
| commit | d97d1708d68a98c039db8a06c4110bfc961d3fb1 (patch) | |
| tree | 1a90cd7a34793982aa9376468feb41e67d2b7cdc /source/Irrlicht/CXMeshFileLoader.h | |
| parent | ba77d01c91a363ad932ecd26c3eaba82ddf7a6f0 (diff) | |
| parent | 799c8b936f9a2cc4f3a8bc56237fb9a8dedf853e (diff) | |
| download | irrlicht-d97d1708d68a98c039db8a06c4110bfc961d3fb1.tar.xz | |
Resolve conflicts with master
Diffstat (limited to 'source/Irrlicht/CXMeshFileLoader.h')
| -rw-r--r-- | source/Irrlicht/CXMeshFileLoader.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/Irrlicht/CXMeshFileLoader.h b/source/Irrlicht/CXMeshFileLoader.h index cfedfd0..ca934a8 100644 --- a/source/Irrlicht/CXMeshFileLoader.h +++ b/source/Irrlicht/CXMeshFileLoader.h @@ -14,7 +14,6 @@ namespace irr {
namespace io
{
- class IFileSystem;
class IReadFile;
} // end namespace io
namespace scene
@@ -27,7 +26,7 @@ class CXMeshFileLoader : public IMeshLoader public:
//! Constructor
- CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs);
+ CXMeshFileLoader(scene::ISceneManager* smgr);
//! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".cob")
|