Merge branch 'opengl3' of https://github.com/numberZero/irrlicht

[irrlicht.git] / source / Irrlicht / COpenGLShaderMaterialRenderer.h

diff --git a/source/Irrlicht/COpenGLShaderMaterialRenderer.h b/source/Irrlicht/COpenGLShaderMaterialRenderer.h
index 7cae915e56b5fc5eb2c0aaa515ad921c4d18240b..81f8c81192812ebc69749167dd17504ff326ad78 100644 (file)
--- a/source/Irrlicht/COpenGLShaderMaterialRenderer.h
+++ b/source/Irrlicht/COpenGLShaderMaterialRenderer.h
@@ -5,7 +5,6 @@
 #ifndef __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__\r
 #define __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__\r
 \r
-#include "IrrCompileConfig.h"\r
 \r
 #ifdef _IRR_COMPILE_WITH_OPENGL_\r
 \r
@@ -35,17 +34,17 @@ public:
        virtual ~COpenGLShaderMaterialRenderer();\r
 \r
        virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,\r
-               bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_;\r
+               bool resetAllRenderstates, IMaterialRendererServices* services) override;\r
 \r
-       virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_;\r
+       bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) override;\r
 \r
-       virtual void OnUnsetMaterial() _IRR_OVERRIDE_;\r
+       void OnUnsetMaterial() override;\r
 \r
        //! Returns if the material is transparent.\r
-       virtual bool isTransparent() const _IRR_OVERRIDE_;\r
+       bool isTransparent() const override;\r
 \r
        //! Access the callback provided by the users when creating shader materials\r
-       virtual IShaderConstantSetCallBack* getShaderConstantSetCallBack() const _IRR_OVERRIDE_\r
+       IShaderConstantSetCallBack* getShaderConstantSetCallBack() const override\r
        { \r
                return CallBack;\r
        }\r