diff --git a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h index bf692554e5..df7fa0535f 100644 --- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h +++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h @@ -88,13 +88,13 @@ namespace ScriptCanvasEditor void Enter() override { - //Log("ENTER >> %s", GetName()); + Log("ENTER >> %s", GetName()); OnEnter(); } ExitStatus Exit() override { - //Log("EXIT << %s", GetName()); + Log("EXIT << %s", GetName()); return OnExit(); } diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h index 30f73dca92..73ce19e4e1 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h @@ -117,9 +117,10 @@ namespace ScriptCanvasEditor size_t m_currentAssetIndex = 0; size_t m_inspectedAssets = 0; + AZStd::vector> m_activeAssets; + IUpgradeRequests::AssetList m_assetsToInspect; IUpgradeRequests::AssetList::iterator m_inspectingAsset; - using UpgradeAssets = AZStd::vector>; UpgradeAssets m_assetsToUpgrade; UpgradeAssets::iterator m_inProgressAsset; @@ -157,5 +158,7 @@ namespace ScriptCanvasEditor bool m_overwriteAll = false; void PerformMove(AZ::Data::Asset& asset, const AZStd::string& source, const AZStd::string& target); + + void Log(const char* format, ...); }; } diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.ui b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.ui index d02ddd0054..3e2604dd99 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.ui +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.ui @@ -321,6 +321,26 @@ + + + + Force Upgrade + + + false + + + + + + + Verbose + + + false + + + diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui b/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui index ddb8100821..1208a55a64 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui @@ -128,6 +128,7 @@ +