1
0

Merging r6256 from trunk to ogl-es branch

(fixing OSX again)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:20:42 +00:00
parent ee3579015b
commit 1efc93d766
196 changed files with 832 additions and 991 deletions

View File

@@ -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 __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__
#define __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__
#ifndef IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED
#define IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED
#include "IParticleEmitter.h"
#include "IAnimatedMeshSceneNode.h"
@@ -43,12 +43,10 @@ public:
virtual bool getEveryMeshVertex() const = 0;
//! Get emitter type
virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_ANIMATED_MESH; }
virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_ANIMATED_MESH; }
};
} // end namespace scene
} // end namespace irr
#endif // __I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED__
#endif // IRR_I_PARTICLE_ANIMATED_MESH_SCENE_NODE_EMITTER_H_INCLUDED