birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix upgrade scanner

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-11-15 17:15:05 -08:00
parent 89a97a5e49
commit 0e7d732c61
21 changed files with 239 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
+3 -1
View File
@@ -26,6 +26,8 @@
#include <ScriptCanvas/Variable/VariableCore.h>
#include <AzCore/Interface/Interface.h>
#include <ScriptCanvas/Core/Core.h>
namespace GraphCanvas
{
class GraphCanvasTreeItem;
@@ -223,7 +225,7 @@ namespace ScriptCanvasEditor
virtual void OnUpgradeStart() {}
virtual void OnUpgradeCancelled() {}
virtual void OnGraphUpgradeComplete(AZ::Data::Asset<AZ::Data::AssetData>&, bool skipped = false) { (void)skipped; }
virtual void OnGraphUpgradeComplete(SourceHandle&, bool skipped = false) { (void)skipped; }
};
using UpgradeNotificationsBus = AZ::EBus<UpgradeNotifications>;
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
+1 -1
View File
@@ -237,7 +237,7 @@ namespace ScriptCanvasEditor
IfOutOfDate,
Forced
};
bool UpgradeGraph(const AZ::Data::Asset<AZ::Data::AssetData>& asset, UpgradeRequest request, bool isVerbose = true);
bool UpgradeGraph(SourceHandle& asset, UpgradeRequest request, bool isVerbose = true);
void ConnectGraphCanvasBuses();
void DisconnectGraphCanvasBuses();
///////
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h
+2
View File
@@ -37,6 +37,7 @@ namespace ScriptCanvasEditor
, private EditorScriptCanvasComponentLoggingBus::Handler
, private EditorScriptCanvasComponentRequestBus::Handler
, private AssetTrackerNotificationBus::Handler
, private AzToolsFramework::AssetSystemBus::Handler
, private AzToolsFramework::EditorEntityContextNotificationBus::Handler
{
@@ -44,6 +45,7 @@ namespace ScriptCanvasEditor
AZ_COMPONENT(EditorScriptCanvasComponent, "{C28E2D29-0746-451D-A639-7F113ECF5D72}", AzToolsFramework::Components::EditorComponentBase);
EditorScriptCanvasComponent();
// EditorScriptCanvasComponent(AZ::Data::Asset<ScriptCanvasAsset> asset);
EditorScriptCanvasComponent(AZ::Data::Asset<ScriptCanvasAsset> asset);
~EditorScriptCanvasComponent() override;
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h
+2 -2
View File
@@ -184,9 +184,9 @@ namespace ScriptCanvasEditor
bool m_graphNeedsDirtying = false;
Graph* m_graph = nullptr;
AZ::Data::Asset<AZ::Data::AssetData> m_asset;
SourceHandle m_asset;
void SetAsset(const AZ::Data::Asset<AZ::Data::AssetData>& asset);
void SetAsset(SourceHandle& assetasset);
void OnComplete(IState::ExitStatus exitStatus) override;