Merging r6250 through r6254 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
// This file is part of the "Irrlicht Engine".
|
||||
// For conditions of distribution and use, see copyright notice in irrlicht.h
|
||||
|
||||
#ifndef __IRR_OBJ_MESH_WRITER_H_INCLUDED__
|
||||
#define __IRR_OBJ_MESH_WRITER_H_INCLUDED__
|
||||
#ifndef IRR_OBJ_MESH_WRITER_H_INCLUDED
|
||||
#define IRR_OBJ_MESH_WRITER_H_INCLUDED
|
||||
|
||||
#include "IMeshWriter.h"
|
||||
#include "S3DVertex.h"
|
||||
@@ -29,10 +29,10 @@ namespace scene
|
||||
virtual ~COBJMeshWriter();
|
||||
|
||||
//! Returns the type of the mesh writer
|
||||
virtual EMESH_WRITER_TYPE getType() const _IRR_OVERRIDE_;
|
||||
virtual EMESH_WRITER_TYPE getType() const IRR_OVERRIDE;
|
||||
|
||||
//! writes a mesh
|
||||
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE) _IRR_OVERRIDE_;
|
||||
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE) IRR_OVERRIDE;
|
||||
|
||||
protected:
|
||||
// create vector output with line end into string
|
||||
@@ -55,4 +55,3 @@ namespace scene
|
||||
} // end namespace
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user