Resolve conflicts with master

1 files changed, 2 insertions, 2 deletions

diff --git a/source/Irrlicht/CB3DMeshWriter.cpp b/source/Irrlicht/CB3DMeshWriter.cpp
index ac68f77..2b4a679 100644
--- a/source/Irrlicht/CB3DMeshWriter.cpp
+++ b/source/Irrlicht/CB3DMeshWriter.cpp
@@ -94,7 +94,7 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
     u32 numTexture = texs.size();

     for (u32 i = 0; i < numTexture; i++)

 	{

-        file->write(texs[i].TextureName.c_str(), texs[i].TextureName.size() + 1);

+        file->write(texs[i].TextureName.c_str(), (size_t)texs[i].TextureName.size() + 1);

         file->write(&texs[i].Flags, 7*4);

     }

 

@@ -476,7 +476,7 @@ core::array<ISkinnedMesh::SJoint*> CB3DMeshWriter::getRootJoints(const ISkinnedM
     return roots;

 }

 

-u32 CB3DMeshWriter::getUVlayerCount(IMesh* mesh)

+u32 CB3DMeshWriter::getUVlayerCount(const IMesh* mesh)

 {

     const u32 numBeshBuffers = mesh->getMeshBufferCount();

     for (u32 i = 0; i < numBeshBuffers; i++)