mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-28 02:53:49 +00:00
Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0
This commit is contained in:
commit
6a357d8dfb
1537 changed files with 173488 additions and 37732 deletions
|
|
@ -43,9 +43,9 @@ ConsoleDocClass( GuiToolboxButtonCtrl,
|
|||
//-------------------------------------
|
||||
GuiToolboxButtonCtrl::GuiToolboxButtonCtrl()
|
||||
{
|
||||
INIT_IMAGEASSET(NormalBitmap);
|
||||
INIT_IMAGEASSET(LoweredBitmap);
|
||||
INIT_IMAGEASSET(HoverBitmap);
|
||||
INIT_ASSET(NormalBitmap);
|
||||
INIT_ASSET(LoweredBitmap);
|
||||
INIT_ASSET(HoverBitmap);
|
||||
|
||||
setMinExtent(Point2I(16,16));
|
||||
setExtent(48, 48);
|
||||
|
|
@ -193,6 +193,6 @@ void GuiToolboxButtonCtrl::renderButton(GFXTexHandle &texture, Point2I &offset,
|
|||
}
|
||||
}
|
||||
|
||||
DEF_IMAGEASSET_BINDS(GuiToolboxButtonCtrl, NormalBitmap);
|
||||
DEF_IMAGEASSET_BINDS(GuiToolboxButtonCtrl, LoweredBitmap);
|
||||
DEF_IMAGEASSET_BINDS(GuiToolboxButtonCtrl, HoverBitmap);
|
||||
DEF_ASSET_BINDS(GuiToolboxButtonCtrl, NormalBitmap);
|
||||
DEF_ASSET_BINDS(GuiToolboxButtonCtrl, LoweredBitmap);
|
||||
DEF_ASSET_BINDS(GuiToolboxButtonCtrl, HoverBitmap);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue