TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 21:40:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Undo TorqueLab changes until it works properly

Browse source
This commit is contained in:
Duion 2015-09-06 23:14:36 +02:00
parent 683a11e384
commit 9b8114d4e1
8 changed files with 12 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/gui/buttons/guiSwatchButtonCtrl.cpp
View file

@ -66,16 +66,14 @@ GuiSwatchButtonCtrl::GuiSwatchButtonCtrl()
static StringTableEntry sProfile = StringTable->insert( "profile" );
setDataField( sProfile, NULL, "GuiInspectorSwatchButtonProfile" );
mGridBitmap = StringTable->insert("tools/gui/images/transp_grid"); //TorqueLab bad bitmap crash fix
//mGridBitmap = "tools/gui/images/transp_grid";
mGridBitmap = "tools/gui/images/transp_grid";
}
void GuiSwatchButtonCtrl::initPersistFields()
{
addField( "color", TypeColorF, Offset( mSwatchColor, GuiSwatchButtonCtrl ), "The foreground color of GuiSwatchButtonCtrl" );
addField("gridBitmap", TypeFilename, Offset(mGridBitmap, GuiSwatchButtonCtrl), "The bitmap used for the transparent grid");//TorqueLab bad bitmap crash fix
//addField( "gridBitmap", TypeString, Offset( mGridBitmap, GuiSwatchButtonCtrl ), "The bitmap used for the transparent grid" );
addField( "gridBitmap", TypeString, Offset( mGridBitmap, GuiSwatchButtonCtrl ), "The bitmap used for the transparent grid" );
Parent::initPersistFields();
}

3
Engine/source/gui/buttons/guiSwatchButtonCtrl.h
View file

@ -42,8 +42,7 @@ class GuiSwatchButtonCtrl : public GuiButtonBaseCtrl
ColorF mSwatchColor;
/// Bitmap used for mGrid
StringTableEntry mGridBitmap; //TorqueLab bad bitmap crash fix
//String mGridBitmap;
String mGridBitmap;
/// Background texture that will show through with transparent colors.
GFXTexHandle mGrid;