Merging r6122 through r6127 from trunk to ogl-es branch

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

diff --git a/source/Irrlicht/CNSOGLManager.h b/source/Irrlicht/CNSOGLManager.h
index 42a6317f97e9a1d4d79583c0fe215a8ea7abf6f3..c4e38124a80b562656ed150e657fa6693d4c39da 100644 (file)
--- a/source/Irrlicht/CNSOGLManager.h
+++ b/source/Irrlicht/CNSOGLManager.h
@@ -52,7 +52,7 @@ namespace video
                const SExposedVideoData& getContext() const;\r
 \r
                //! Change render context, disable old and activate new defined by videoData\r
-               bool activateContext(const SExposedVideoData& videoData);\r
+               bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_;\r
 \r
         // Swap buffers.\r
         bool swapBuffers();\r
@@ -61,7 +61,7 @@ namespace video
         SIrrlichtCreationParameters Params;\r
                SExposedVideoData PrimaryContext;\r
         SExposedVideoData CurrentContext;\r
-        \r
+\r
         NSOpenGLPixelFormat* PixelFormat;\r
        };\r
 }\r