TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-20 03:45:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Engine/source/console/test/ScriptTest.cpp
#	Engine/source/console/test/consoleTest.cpp
This commit is contained in:
Jeff Hutchinson 2021-05-06 21:08:53 -04:00
commit 69d7a2f4a1
12 changed files with 90 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -2552,7 +2552,7 @@ function MaterialEditorGui::saveCompositeMap(%this)
%saveAs = "";
%dlg = new SaveFileDialog()
{
Filters = "png";
Filters = "PNG File (*.png)|*.png";
DefaultPath = EditorSettings.value("data/");
ChangePath = false;
OverwritePrompt = true;
@ -2566,6 +2566,9 @@ function MaterialEditorGui::saveCompositeMap(%this)
%saveAs = %dlg.FileName;
}
if( fileExt( %saveAs ) !$= ".png" )
%saveAs = %saveAs @ ".png";
%material = %this.currentMaterial;
%layer = %this.currentLayer;