TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-10 22:24:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/development' into development

Browse source
This commit is contained in:
marauder2k7 2026-03-12 20:52:18 +00:00
commit 7a00e9464b
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -669,8 +669,8 @@ void ImageAsset::populateImage(void)
mImageHeight = tempFile->mHeight;
}
ddsFs->close();
delete tempFile;
delete ddsFs;
}
else
{

15
Engine/source/gui/controls/guiPopUpCtrlEx.cpp
View file

@ -1651,10 +1651,17 @@ void GuiPopUpMenuCtrlEx::addChildren()
void GuiPopUpMenuCtrlEx::removeChildren()
{
mTl->deleteObject();
mSc->deleteObject();
mSearchEdit->deleteObject();
mBackground->deleteObject();
if (mTl && !mTl->isDeleted())
mTl->deleteObject();
if (mSc && !mSc->isDeleted())
mSc->deleteObject();
if (mSearchEdit && !mSearchEdit->isDeleted())
mSearchEdit->deleteObject();
if (mBackground && !mBackground->isDeleted())
mBackground->deleteObject();
}
//------------------------------------------------------------------------------