Skip to content

Commit 76c5e30

Browse files
authored
Merge pull request #321 from Azaezel/alpha40_miscCleanups26Sep2020
minor cleanups:
2 parents d160e3f + e88b7a0 commit 76c5e30

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Engine/source/gfx/gl/gfxGLTextureObject.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp)
185185
U8* orig = (U8*)mem.alloc(srcPixelCount * srcBytesPerPixel);
186186

187187
glGetTexImage(mBinding, mip, GFXGLTextureFormat[mFormat], GFXGLTextureType[mFormat], orig);
188-
189-
PROFILE_START(GFXGLTextureObject_copyToBmp_pixCopy);
190188
if (mFormat == GFXFormatR16G16B16A16F)
191189
{
192190
dMemcpy(dest, orig, srcPixelCount * srcBytesPerPixel);
@@ -207,7 +205,6 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp)
207205
}
208206
}
209207
glBindTexture(mBinding, NULL);
210-
PROFILE_END();
211208

212209
return true;
213210
}

Engine/source/gui/controls/guiGameListMenuCtrl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class GuiGameListMenuCtrl : public GuiControl
164164
void addRow(const char* label, const char* bitmapName, const char* callback, S32 icon, S32 yPad, bool enabled, const char* tooltip);
165165

166166
//Removes row at the provided index
167-
void GuiGameListMenuCtrl::removeRow(const S32& row);
167+
void removeRow(const S32& row);
168168

169169
/// Gets the text for the currently selected option of the given row.
170170
///

0 commit comments

Comments
 (0)