Merge branch 'master' into stable

1 files changed, 14 insertions, 8 deletions

diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 6bc25be32..72fbd8a99 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -131,12 +131,18 @@ void NormalOpenGLGraphics::initArrays()
     // need alocate small size, after if limit reached reallocate to double size
     vertexBufSize = mMaxVertices;
     const int sz = mMaxVertices * 4 + 30;
-    mFloatTexArray = new GLfloat[sz];
-    mIntTexArray = new GLint[sz];
-    mIntVertArray = new GLint[sz];
-    mFloatTexArrayCached = new GLfloat[sz];
-    mIntTexArrayCached = new GLint[sz];
-    mIntVertArrayCached = new GLint[sz];
+    if (!mFloatTexArray)
+        mFloatTexArray = new GLfloat[sz];
+    if (!mIntTexArray)
+        mIntTexArray = new GLint[sz];
+    if (!mIntVertArray)
+        mIntVertArray = new GLint[sz];
+    if (!mFloatTexArrayCached)
+        mFloatTexArrayCached = new GLfloat[sz];
+    if (!mIntTexArrayCached)
+        mIntTexArrayCached = new GLint[sz];
+    if (!mIntVertArrayCached)
+        mIntVertArrayCached = new GLint[sz];
 }
 
 bool NormalOpenGLGraphics::setVideoMode(const int w, const int h,
@@ -1094,7 +1100,7 @@ void NormalOpenGLGraphics::updateScreen()
     BLOCK_END("Graphics::updateScreen")
 }
 
-void NormalOpenGLGraphics::_beginDraw()
+void NormalOpenGLGraphics::beginDraw()
 {
     glMatrixMode(GL_TEXTURE);
     glLoadIdentity();
@@ -1148,7 +1154,7 @@ void NormalOpenGLGraphics::_beginDraw()
     pushClipArea(Rect(0, 0, w, h));
 }
 
-void NormalOpenGLGraphics::_endDraw()
+void NormalOpenGLGraphics::endDraw()
 {
     popClipArea();
 }