TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'DirectImageFileOption' of https://github.com/Areloch/Torque3D into development

Browse source
This commit is contained in:
JeffR 2025-05-30 00:08:29 -05:00
commit 5397c168bc
10 changed files with 65 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/controls/guiBitmapCtrl.cpp
View file

@ -121,7 +121,7 @@ void GuiBitmapCtrl::setBitmap(const char* name, bool resize)
if (assetId != StringTable->EmptyString())
_setBitmap(assetId);
else
return;
_setBitmap(name);
}
mBitmap = mBitmapAsset->getTexture(&GFXDefaultGUIProfile);