TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #321 from Azaezel/alpha40_miscCleanups26Sep2020

Browse source 
minor cleanups:
This commit is contained in:
Brian Roberts 2020-09-27 12:17:12 -05:00 • committed by GitHub
commit 76c5e30869
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/gfx/gl/gfxGLTextureObject.cpp
View file

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

2
Engine/source/gui/controls/guiGameListMenuCtrl.h
View file

@ -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); 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 //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. /// Gets the text for the currently selected option of the given row.
/// ///