Browse Source

Merge pull request #2305 from Azaezel/copyCleanup

corrects a copy-corruption flaw with GuiSwatchButtonCtrl::onMouseDragged
Areloch 6 năm trước cách đây
mục cha
commit
e7314dfa09
1 tập tin đã thay đổi với 1 bổ sung1 xóa
  1. 1 1
      Engine/source/gui/buttons/guiSwatchButtonCtrl.cpp

+ 1 - 1
Engine/source/gui/buttons/guiSwatchButtonCtrl.cpp

@@ -72,7 +72,7 @@ GuiSwatchButtonCtrl::GuiSwatchButtonCtrl()
 void GuiSwatchButtonCtrl::initPersistFields()
 {
    addField("color", TypeColorF, Offset(mSwatchColor, GuiSwatchButtonCtrl), "The foreground color of GuiSwatchButtonCtrl");
-   addField( "gridBitmap", TypeString, Offset( mGridBitmap, GuiSwatchButtonCtrl ), "The bitmap used for the transparent grid" );
+   addField( "gridBitmap", TypeRealString, Offset( mGridBitmap, GuiSwatchButtonCtrl ), "The bitmap used for the transparent grid" );
    
    Parent::initPersistFields();
 }