Browse Source

GuiBitmapCtrl named texture fixes.
Adds StringTableEntry when bitmap is set via setBitmapHandle.
Prevents existing bitmap handles from being dropped in onWake (they are preserved in onSleep).

OTHGMars 3 years ago
parent
commit
bed3be278c
1 changed files with 3 additions and 2 deletions
  1. 3 2
      Engine/source/gui/controls/guiBitmapCtrl.cpp

+ 3 - 2
Engine/source/gui/controls/guiBitmapCtrl.cpp

@@ -98,7 +98,8 @@ bool GuiBitmapCtrl::onWake()
       return false;
       return false;
    setActive(true);
    setActive(true);
 
 
-   setBitmap(getBitmap());
+   if (mBitmapName != StringTable->insert("texhandle"))
+      setBitmap(getBitmap());
    return true;
    return true;
 }
 }
 
 
@@ -152,7 +153,7 @@ void GuiBitmapCtrl::setBitmapHandle(GFXTexHandle handle, bool resize)
 {
 {
    mBitmap = handle;
    mBitmap = handle;
 
 
-   mBitmapName = String("texhandle");
+   mBitmapName = StringTable->insert("texhandle");
 
 
    // Resize the control to fit the bitmap
    // Resize the control to fit the bitmap
    if (resize) 
    if (resize)