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:
@@ -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_SPHERE_EMITTER_H_INCLUDED__
|
||||
#define __I_PARTICLE_SPHERE_EMITTER_H_INCLUDED__
|
||||
#ifndef IRR_I_PARTICLE_SPHERE_EMITTER_H_INCLUDED
|
||||
#define IRR_I_PARTICLE_SPHERE_EMITTER_H_INCLUDED
|
||||
|
||||
#include "IParticleEmitter.h"
|
||||
|
||||
@@ -30,12 +30,10 @@ public:
|
||||
virtual f32 getRadius() const = 0;
|
||||
|
||||
//! Get emitter type
|
||||
virtual E_PARTICLE_EMITTER_TYPE getType() const _IRR_OVERRIDE_ { return EPET_SPHERE; }
|
||||
virtual E_PARTICLE_EMITTER_TYPE getType() const IRR_OVERRIDE { return EPET_SPHERE; }
|
||||
};
|
||||
|
||||
} // end namespace scene
|
||||
} // end namespace irr
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user