Browse Source

Merge pull request #321 from Azaezel/alpha40_miscCleanups26Sep2020

minor cleanups:
Brian Roberts 5 years ago
parent
commit
76c5e30869

+ 0 - 3
Engine/source/gfx/gl/gfxGLTextureObject.cpp

@@ -185,8 +185,6 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp)
       U8* orig = (U8*)mem.alloc(srcPixelCount * srcBytesPerPixel);
 
       glGetTexImage(mBinding, mip, GFXGLTextureFormat[mFormat], GFXGLTextureType[mFormat], orig);
-
-      PROFILE_START(GFXGLTextureObject_copyToBmp_pixCopy);
       if (mFormat == GFXFormatR16G16B16A16F)
       {
          dMemcpy(dest, orig, srcPixelCount * srcBytesPerPixel);
@@ -207,7 +205,6 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp)
       }
    }
    glBindTexture(mBinding, NULL);
-   PROFILE_END();
 
    return true;
 }

+ 1 - 1
Engine/source/gui/controls/guiGameListMenuCtrl.h

@@ -164,7 +164,7 @@ public:
    void addRow(const char* label, const char* bitmapName, const char* callback, S32 icon, S32 yPad, bool enabled, const char* tooltip);
 
    //Removes row at the provided index
-   void GuiGameListMenuCtrl::removeRow(const S32& row);
+   void removeRow(const S32& row);
 
    /// Gets the text for the currently selected option of the given row.
    ///