TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes cleanup handling on guiBitmapButtonCtrl and guiGameSettingsCtrl to release the bound textures like other GUI controls when they sleep, avoiding a texture object leak.

Browse source 
Fixes a call for UINavigation to getPageCount that was erroneously referencing the pageStack
Fixes fetch and binding of the image for display when using the uvEditor
This commit is contained in:
JeffR 2022-06-09 16:29:32 -05:00
parent 53aea82614
commit 67d8448915
5 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/data/UI/scripts/menuNavigation.tscript
View file

@ -75,7 +75,7 @@ function UINavigation::pushPage(%this, %newPage, %callback)
}
//don't re-add pages
if(%this.pageStack.getPageCount() != 0 &&
if(%this.getPageCount() != 0 &&
%this.pageStack.getIndexFromKey(%newPage) != -1)
return;

13
Templates/BaseGame/game/tools/gui/uvEditor.ed.gui
View file

@ -499,6 +499,15 @@ function UVEditor::showDialog( %this, %applyCallback, %obj, %uv)
// Get the preview bitmap. Code copied from Material Selector.
%material = %obj.material;
if(!isObject(%material))
{
%matAssetId = %obj.materialAsset;
if(%matAssetId !$= "")
{
%matAssetDef = AssetDatabase.acquireAsset(%matAssetId);
%material = %matAssetDef.materialDefinitionName;
}
}
if( %material.getToneMap(0) $= "" && %material.getDiffuseMap(0) $= "" && !isObject(%material.cubemap) )
{
%previewImage = "core/images/warnmat";
@ -507,13 +516,14 @@ function UVEditor::showDialog( %this, %applyCallback, %obj, %uv)
{
if( %material.toneMap[0] !$= "" )
%previewImage = %material.getToneMap(0);
else if( %material.getDiffuseMapAsset(0) !$= "" )
%previewImage = %material.getDiffuseMapAsset(0);
else if( %material.getDiffuseMap(0) !$= "" )
%previewImage = %material.getDiffuseMap(0);
else if( %material.cubemap.cubeFace[0] !$= "" )
%previewImage = %material.cubemap.cubeFace[0];
}
UVEditor-->bitmapPreview.setBitmap(getAssetPreviewImage(%previewImage));
// Set up the color popup
%popup = UVEditor-->colorPopup;
@ -535,6 +545,7 @@ function UVEditor::showDialog( %this, %applyCallback, %obj, %uv)
Canvas.pushDialog(UVEditorOverlay);
UVEditor.setVisible(1);
UVEditor-->bitmapPreview.setBitmap(getAssetPreviewImage(%previewImage));
}
function UVEditor::hideDialog( %this )