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

update macro

Browse source 
Added get##name##File to macro that will check to make sure the asset is not null before getting the image file.
This commit is contained in:
marauder2k7 2025-05-14 00:30:47 +01:00
parent a52069bbc5
commit aa3f07e339
5 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/buttons/guiBitmapButtonCtrl.h
View file

@ -138,6 +138,8 @@ private: AssetPtr<ImageAsset> mBitmapAsset; public: void _setBitmap(StringTableE
} static bool _setBitmapData(void* obj, const char* index, const char* data) {
static_cast<GuiBitmapButtonCtrl*>(obj)->_setBitmap(_getStringTable()->insert(data)); return false;
}
StringTableEntry getBitmapFile() { return mBitmapAsset.notNull() ? mBitmapAsset->getImageFile() : ""; }
protected:
void onAssetRefreshed(AssetPtrBase* pAssetPtrBase) override

2
Engine/source/gui/core/guiTypes.cpp
View file

@ -701,7 +701,7 @@ DefineEngineMethod( GuiControlProfile, getStringWidth, S32, (const char* string)
DefineEngineMethod(GuiControlProfile, getBitmap, const char*, (), , "get name")
{
return object->getBitmapAsset()->getImageFile();
return object->getBitmapFile();
}
DefineEngineMethod(GuiControlProfile, getBitmapAsset, const char*, (), , "")
{