TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes import dialog display after showing the shape changed prompt in the ShapeEditor.

Browse source
This commit is contained in:
OTHGMars 2019-04-25 16:05:21 -04:00
parent 6660f253b5
commit 2638559f94
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs
View file

@ -261,13 +261,13 @@ function ShapeEdSelectWindow::onSelect( %this, %path )
// Prompt user to save the old shape if it is dirty // Prompt user to save the old shape if it is dirty
if ( ShapeEditor.isDirty() ) if ( ShapeEditor.isDirty() )
{ {
%cmd = "ColladaImportDlg.showDialog( \"" @ %path @ "\", \"ShapeEditor.selectShape( \\\"" @ %path @ "\\\", "; %cmd = "showImportDialog( \"" @ %path @ "\", \"ShapeEditor.selectShape( \\\"" @ %path @ "\\\", ";
MessageBoxYesNoCancel( "Shape Modified", "Would you like to save your changes?", %cmd @ "true );\" );", %cmd @ "false );\" );" ); MessageBoxYesNoCancel( "Shape Modified", "Would you like to save your changes?", %cmd @ "true );\" );", %cmd @ "false );\" );" );
} }
else else
{ {
%cmd = "ShapeEditor.selectShape( \"" @ %path @ "\", false );"; %cmd = "ShapeEditor.selectShape( \"" @ %path @ "\", false );";
ColladaImportDlg.showDialog( %path, %cmd ); showImportDialog( %path, %cmd );
} }
} }

2
Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs
View file

@ -261,7 +261,7 @@ function ShapeEdSelectWindow::onSelect( %this, %path )
// Prompt user to save the old shape if it is dirty // Prompt user to save the old shape if it is dirty
if ( ShapeEditor.isDirty() ) if ( ShapeEditor.isDirty() )
{ {
%cmd = "ColladaImportDlg.showDialog( \"" @ %path @ "\", \"ShapeEditor.selectShape( \\\"" @ %path @ "\\\", "; %cmd = "showImportDialog( \"" @ %path @ "\", \"ShapeEditor.selectShape( \\\"" @ %path @ "\\\", ";
MessageBoxYesNoCancel( "Shape Modified", "Would you like to save your changes?", %cmd @ "true );\" );", %cmd @ "false );\" );" ); MessageBoxYesNoCancel( "Shape Modified", "Would you like to save your changes?", %cmd @ "true );\" );", %cmd @ "false );\" );" );
} }
else else