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 __I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED__
|
||||
#define __I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED__
|
||||
#ifndef IRR_I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED
|
||||
#define IRR_I_SCENE_NODE_ANIMATOR_FINISHING_H_INCLUDED
|
||||
|
||||
#include "ISceneNode.h"
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace scene
|
||||
ISceneNodeAnimatorFinishing(u32 finishTime)
|
||||
: FinishTime(finishTime), HasFinished(false) { }
|
||||
|
||||
virtual bool hasFinished(void) const _IRR_OVERRIDE_ { return HasFinished; }
|
||||
virtual bool hasFinished(void) const IRR_OVERRIDE { return HasFinished; }
|
||||
|
||||
protected:
|
||||
|
||||
@@ -33,4 +33,3 @@ namespace scene
|
||||
} // end namespace irr
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user