From 8f45b0d53a3c398df88d83681c24a25863b910ba Mon Sep 17 00:00:00 2001
From: wareya <wareya@gmail.com>
Date: Sat, 9 Jun 2018 10:11:43 -0400
Subject: [PATCH] remove unnecessary conditions

---
 components/esmterrain/storage.cpp | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index a1b4856e1..fd04d90b9 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -434,19 +434,14 @@ namespace ESMTerrain
         const int imageScaleFactor = 2;
         const int blendmapImageSize = blendmapSize * imageScaleFactor;
         
-        
-        const bool largeImage = true;
-
         for (int i=0; i<numBlendmaps; ++i)
         {
             GLenum format = pack ? GL_RGBA : GL_ALPHA;
 
             osg::ref_ptr<osg::Image> image (new osg::Image);
-            if(!largeImage)
-                image->allocateImage(blendmapSize, blendmapSize, 1, format, GL_UNSIGNED_BYTE);
-            else
-                image->allocateImage(blendmapImageSize, blendmapImageSize, 1, format, GL_UNSIGNED_BYTE);
+            image->allocateImage(blendmapImageSize, blendmapImageSize, 1, format, GL_UNSIGNED_BYTE);
             unsigned char* pData = image->data();
+            
             for (int y=0; y<blendmapSize; ++y)
             {
                 for (int x=0; x<blendmapSize; ++x)
@@ -459,21 +454,13 @@ namespace ESMTerrain
                     
                     int alpha = (blendIndex == i) ? 255 : 0;
                     
-                    if(!largeImage)
-                        pData[((blendmapSize - y - 1)*blendmapSize + x)*channels + channel] = alpha;
-                    else
-                    {
-                        int realY = (blendmapSize - y - 1)*imageScaleFactor;
-                        int realX = x*imageScaleFactor;
-                        if(true)
-                            pData[((realY+0)*blendmapImageSize + realX + 0)*channels + channel] = alpha;
-                        if(realY+1 < blendmapImageSize)
-                            pData[((realY+1)*blendmapImageSize + realX + 0)*channels + channel] = alpha;
-                        if(realX+1 < blendmapImageSize)
-                            pData[((realY+0)*blendmapImageSize + realX + 1)*channels + channel] = alpha;
-                        if(realY+1 < blendmapImageSize && realX+1 < blendmapImageSize)
-                            pData[((realY+1)*blendmapImageSize + realX + 1)*channels + channel] = alpha;
-                    }
+                    int realY = (blendmapSize - y - 1)*imageScaleFactor;
+                    int realX = x*imageScaleFactor;
+                    
+                    pData[((realY+0)*blendmapImageSize + realX + 0)*channels + channel] = alpha;
+                    pData[((realY+1)*blendmapImageSize + realX + 0)*channels + channel] = alpha;
+                    pData[((realY+0)*blendmapImageSize + realX + 1)*channels + channel] = alpha;
+                    pData[((realY+1)*blendmapImageSize + realX + 1)*channels + channel] = alpha;
                 }
             }
             blendmaps.push_back(image);