From 2638559f9458ddccd505f3a9cc2d164e90f3752e Mon Sep 17 00:00:00 2001 From: OTHGMars Date: Thu, 25 Apr 2019 16:05:21 -0400 Subject: [PATCH] Fixes import dialog display after showing the shape changed prompt in the ShapeEditor. --- .../BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs | 4 ++-- .../Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs index b9551c983..ea70f7363 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs +++ b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs @@ -261,13 +261,13 @@ function ShapeEdSelectWindow::onSelect( %this, %path ) // Prompt user to save the old shape if it is dirty 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 );\" );" ); } else { %cmd = "ShapeEditor.selectShape( \"" @ %path @ "\", false );"; - ColladaImportDlg.showDialog( %path, %cmd ); + showImportDialog( %path, %cmd ); } } diff --git a/Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs b/Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs index 1bada1ad7..1e5f896cb 100644 --- a/Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs +++ b/Templates/Full/game/tools/shapeEditor/scripts/shapeEditor.ed.cs @@ -261,7 +261,7 @@ function ShapeEdSelectWindow::onSelect( %this, %path ) // Prompt user to save the old shape if it is dirty 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 );\" );" ); } else