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.cpp | |
| parent | ba77d01c91a363ad932ecd26c3eaba82ddf7a6f0 (diff) | |
| parent | 799c8b936f9a2cc4f3a8bc56237fb9a8dedf853e (diff) | |
| download | irrlicht-d97d1708d68a98c039db8a06c4110bfc961d3fb1.tar.xz | |
Resolve conflicts with master
Diffstat (limited to 'source/Irrlicht/CXMeshFileLoader.cpp')
| -rw-r--r-- | source/Irrlicht/CXMeshFileLoader.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp index 7603ec5..c06cd17 100644 --- a/source/Irrlicht/CXMeshFileLoader.cpp +++ b/source/Irrlicht/CXMeshFileLoader.cpp @@ -10,7 +10,6 @@ #include "coreutil.h"
#include "ISceneManager.h"
#include "IVideoDriver.h"
-#include "IFileSystem.h"
#include "IReadFile.h"
#ifdef _DEBUG
@@ -24,7 +23,7 @@ namespace scene {
//! Constructor
-CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs)
+CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr)
: AnimatedMesh(0), Buffer(0), P(0), End(0), BinaryNumCount(0), Line(0),
CurFrame(0), MajorVersion(0), MinorVersion(0), BinaryFormat(false), FloatSize(0)
{
@@ -480,7 +479,7 @@ bool CXMeshFileLoader::parseDataObject() // parse specific object
#ifdef _XREADER_DEBUG
- os::Printer::log("debug DataObject:", objectName.c_str(), ELL_DEBUG);
+ os::Printer::log("debug DataObject", objectName.c_str(), ELL_DEBUG);
#endif
if (objectName == "template")
@@ -833,7 +832,7 @@ bool CXMeshFileLoader::parseDataObjectMesh(SXMesh &mesh) }
#ifdef _XREADER_DEBUG
- os::Printer::log("debug DataObject in mesh:", objectName.c_str(), ELL_DEBUG);
+ os::Printer::log("debug DataObject in mesh", objectName.c_str(), ELL_DEBUG);
#endif
if (objectName == "MeshNormals")
|