From 29652994d88d2c34431a55bc43a2f089eeef1ac4 Mon Sep 17 00:00:00 2001
From: chcurran <82187351+carlitosan@users.noreply.github.com>
Date: Wed, 7 Jul 2021 10:45:16 -0700
Subject: [PATCH] The Great ScriptCanvas Purge, Part VIII

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
---
 .../Builder/ScriptCanvasBuilderComponent.cpp  |  5 ++--
 .../Code/Include/ScriptCanvas/Core/Graph.cpp  | 26 +++++--------------
 .../Code/Include/ScriptCanvas/Core/Graph.h    |  4 ---
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
index a953edeae8..2f30106707 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderComponent.cpp
@@ -5,17 +5,16 @@
  *
  */
 
-#include <precompiled.h>
-
 #include <AssetBuilderSDK/AssetBuilderBusses.h>
 #include <AzCore/std/containers/map.h>
 #include <AzToolsFramework/ToolsComponents/ToolsAssetCatalogBus.h>
 #include <Builder/ScriptCanvasBuilder.h>
 #include <Builder/ScriptCanvasBuilderComponent.h>
 #include <Builder/ScriptCanvasBuilderWorker.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
 #include <ScriptCanvas/Asset/RuntimeAssetHandler.h>
+#include <ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h>
 #include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
+#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
 #include <ScriptCanvas/Utils/BehaviorContextUtils.h>
 
 namespace ScriptCanvasBuilder
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
index 48e8adb9a7..d4eb1cd515 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
@@ -50,6 +50,7 @@ namespace GraphCpp
         MergeScriptAssetDescriptions,
         VariablePanelSymantics,
         AddVersionData,
+        RemoveFunctionGraphMarker,
         // label your version above
         Current
     };
@@ -69,6 +70,11 @@ namespace ScriptCanvas
             componentElementNode.AddElementWithData(context, "m_assetType", azrtti_typeid<RuntimeAsset>());
         }
 
+        if (componentElementNode.GetVersion() < GraphCpp::GraphVersion::RemoveFunctionGraphMarker)
+        {
+            componentElementNode.RemoveElementByName(AZ_CRC_CE("isFunctionGraph"));
+        }
+
         return true;
     }
 
@@ -99,18 +105,15 @@ namespace ScriptCanvas
         Nodes::ComparisonExpression::Reflect(context);
         Datum::Reflect(context);
         BehaviorContextObjectPtrReflect(context);
-
         GraphData::Reflect(context);
 
-        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
-        if (serializeContext)
+        if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
             serializeContext->Class<Graph, AZ::Component>()
                 ->Version(GraphCpp::GraphVersion::Current, &GraphComponentVersionConverter)
                 ->Field("m_graphData", &Graph::m_graphData)
                 ->Field("executionMode", &Graph::m_executionMode)
                 ->Field("m_assetType", &Graph::m_assetType)
-                ->Field("isFunctionGraph", &Graph::m_isFunctionGraph)
                 ->Field("versionData", &Graph::m_versionData)
                 ;
         }
@@ -150,21 +153,6 @@ namespace ScriptCanvas
         StatusRequestBus::Handler::BusConnect(scriptCanvasId);
     }
 
-    bool Graph::IsFunctionGraph() const
-    {
-        if (m_isFunctionGraph)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    void Graph::MarkFunctionGraph()
-    {
-        m_isFunctionGraph = true;
-    }
-
     void Graph::MarkVersion()
     {
         m_versionData.MarkLatest();
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
index 92de8f3c3e..bdd71a73f8 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
@@ -110,9 +110,6 @@ namespace ScriptCanvas
 
         Graph* GetGraph() { return this; }
 
-        bool IsFunctionGraph() const;
-        void MarkFunctionGraph();
-
         GraphData* GetGraphData() override { return &m_graphData; }
         const GraphData* GetGraphDataConst() const override { return &m_graphData; }
         const VariableData* GetVariableDataConst() const { return const_cast<Graph*>(this)->GetVariableData(); }
@@ -204,7 +201,6 @@ namespace ScriptCanvas
         AZ::Data::AssetType m_assetType;
 
     private:
-        bool m_isFunctionGraph = false;
         ScriptCanvasId m_scriptCanvasId;
         ExecutionMode m_executionMode = ExecutionMode::Interpreted;
         VersionData m_versionData;