TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #449 from OTHGMars/Zip_Test2

Browse source 
Loading from zipped game directories.
This commit is contained in:
Areloch 2021-07-17 11:03:19 -05:00 • committed by GitHub
commit 4d40e3cab5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 280 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gui/buttons/guiIconButtonCtrl.cpp
View file

@ -201,13 +201,13 @@ bool GuiIconButtonCtrl::resize(const Point2I &newPosition, const Point2I &newExt
void GuiIconButtonCtrl::setBitmap(const char *name)
{
mBitmapName = StringTable->insert(name);
mBitmapName = Platform::makeRelativePathName(name, NULL);
if(!isAwake())
return;
if (*mBitmapName)
{
mTextureNormal = GFXTexHandle( name, &GFXTexturePersistentSRGBProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__) );
mTextureNormal = GFXTexHandle(mBitmapName, &GFXTexturePersistentSRGBProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__) );
}
else
{