merge from main

Gems/ScriptCanvas/Assets/Editor/Icons/AssetBrowser/ScriptCanvas_16.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b06062858e8d31aee686f4a4cfec3673d74f75aaa192c90c5414cd982045d61d
-size 263

Gems/ScriptCanvas/Code/Editor/Assets/Functions/ScriptCanvasFunctionAssetHolder.h

@@ -77,4 +77,4 @@ namespace ScriptCanvasEditor
         ScriptChangedCB m_scriptNotifyCallback;
     };
 
-}
+}

Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetInstance.cpp

@@ -156,4 +156,4 @@ namespace ScriptCanvasEditor
 
         return dataFlags;
     }
-}
+}

Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetReference.cpp

@@ -59,4 +59,4 @@ namespace ScriptCanvasEditor
         return m_storeInObjectStream;
     }
 
-}
+}

Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp

@@ -99,8 +99,8 @@ namespace ScriptCanvasEditor
                 editContext->Class<EditorScriptCanvasComponent>("Script Canvas", "The Script Canvas component allows you to add a Script Canvas asset to a component, and have it execute on the specified entity.")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Scripting")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/ScriptCanvas.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/ScriptCanvas.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/ScriptCanvas/Viewport/ScriptCanvas.png")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, ScriptCanvasAssetHandler::GetAssetTypeStatic())
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
@@ -528,8 +528,10 @@ namespace ScriptCanvasEditor
         {
             const auto& variableId = varConfig.m_graphVariable.GetVariableId();
 
+            // We only add component sourced graph properties to the script canvas component, so if this variable was switched to a graph-only property remove it.
+            // Also be sure to remove this variable if it's been deleted entirely.
             auto graphVariable = graphVarData.FindVariable(variableId);
-            if (!graphVariable->IsComponentProperty())
+            if (!graphVariable || !graphVariable->IsComponentProperty())
             {
                 oldVariableIds.push_back(variableId);
             }

Gems/ScriptCanvas/Code/Editor/Components/EditorUtils.cpp

@@ -58,7 +58,7 @@ namespace ScriptCanvasEditor
             }
             else
             {
-                resultHash = ScriptCanvas::NodeUtils::ConstructMethodNodeIdentifier(classMethodTreeItem->GetClassMethodName(), classMethodTreeItem->GetMethodName());
+                resultHash = ScriptCanvas::NodeUtils::ConstructMethodNodeIdentifier(classMethodTreeItem->GetClassMethodName(), classMethodTreeItem->GetMethodName(), classMethodTreeItem->GetPropertyStatus());
             }
         }
         else if (auto globalMethodTreeItem = azrtti_cast<const GlobalMethodEventPaletteTreeItem*>(treeItem); globalMethodTreeItem != nullptr)

Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp

@@ -25,7 +25,7 @@ namespace ScriptCanvasEditor
 {
     AZStd::string IconComponent::LookupClassIcon(const AZ::Uuid& classId)
     {
-        AZStd::string iconPath  = "Editor/Icons/ScriptCanvas/Placeholder.png";
+        AZStd::string iconPath  = "Icons/ScriptCanvas/Placeholder.png";
 
         AZ::SerializeContext* serializeContext = nullptr;
         AZ::ComponentApplicationBus::BroadcastResult(serializeContext, &AZ::ComponentApplicationRequests::GetSerializeContext);

Gems/ScriptCanvas/Code/Editor/Components/IconComponent.h

@@ -48,4 +48,4 @@ namespace ScriptCanvasEditor
     private:
         AZStd::string m_iconPath;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/Debugger/Debugger.h

@@ -15,4 +15,4 @@
 namespace DragonUI
 {
 
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.cpp

@@ -37,4 +37,4 @@ namespace ScriptCanvasEditor
         : NodeDescriptorComponent(NodeDescriptorType::ClassMethod)
     {
     }
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.h

@@ -25,4 +25,4 @@ namespace ScriptCanvasEditor
         ClassMethodNodeDescriptorComponent();
         ~ClassMethodNodeDescriptorComponent() = default;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.h

@@ -74,4 +74,4 @@ namespace ScriptCanvasEditor
 
         ScriptCanvas::Datum m_queuedId;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.h

@@ -125,4 +125,4 @@ namespace ScriptCanvasEditor
         AZStd::unordered_map< ScriptCanvas::EBusEventId, AZ::EntityId > m_eventTypeToId;
         AZStd::unordered_map< AZ::EntityId, ScriptCanvas::EBusEventId > m_idToEventType;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp

@@ -84,4 +84,4 @@ namespace ScriptCanvasEditor
             }
         }        
     }
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.h

@@ -30,4 +30,4 @@ namespace ScriptCanvasEditor
     protected:
         void OnAddedToGraphCanvasGraph(const GraphCanvas::GraphId& graphId, const AZ::EntityId& scriptCanvasNodeId) override;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.cpp

@@ -54,4 +54,4 @@ namespace ScriptCanvasEditor
 
         GraphCanvas::NodeTitleRequestBus::Event(GetEntityId(), &GraphCanvas::NodeTitleRequests::SetTitle, titleName);
     }    
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.h

@@ -30,4 +30,4 @@ namespace ScriptCanvasEditor
     protected:
         void UpdateTitle(AZStd::string_view variableName) override;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.cpp

@@ -52,4 +52,4 @@ namespace ScriptCanvasEditor
 
         GraphCanvas::NodeTitleRequestBus::Event(GetEntityId(), &GraphCanvas::NodeTitleRequests::SetTitle, titleName);
     }
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.h

@@ -31,4 +31,4 @@ namespace ScriptCanvasEditor
     protected:
         void UpdateTitle(AZStd::string_view variableName) override;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.cpp

@@ -37,4 +37,4 @@ namespace ScriptCanvasEditor
         : NodeDescriptorComponent(NodeDescriptorType::UserDefined)
     {
     }
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.h

@@ -25,4 +25,4 @@ namespace ScriptCanvasEditor
         UserDefinedNodeDescriptorComponent();
         ~UserDefinedNodeDescriptorComponent() = default;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.h

@@ -69,4 +69,4 @@ namespace ScriptCanvasEditor
         
         void SetVariableId(const ScriptCanvas::VariableId& variableId);        
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasBoolDataInterface.h

@@ -61,4 +61,4 @@ namespace ScriptCanvasEditor
             }
         }
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasNumericDataInterface.h

@@ -64,4 +64,4 @@ namespace ScriptCanvasEditor
         }
         ////
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasReadOnlyDataInterface.h

@@ -45,4 +45,4 @@ namespace ScriptCanvasEditor
         }
         ////
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVectorDataInterface.h

@@ -117,4 +117,4 @@ namespace ScriptCanvasEditor
             return AZStd::string::format("vector_%i", index);
         }
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasStringPropertyDataInterface.h

@@ -41,4 +41,4 @@ namespace ScriptCanvasEditor
         }
         ////
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertySlotIds.h

@@ -27,4 +27,4 @@ namespace ScriptCanvasEditor
     {
         static const AZ::Crc32 DefaultValue = AZ_CRC("ScriptCanvas_Property_DefaultValue", 0xf837b153);
     }
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h

@@ -52,7 +52,7 @@ namespace ScriptCanvasEditor
                 "Script Canvas Files (*.scriptcanvas)",
                 "Script Canvas",
                 "Script Canvas",
-                "Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.png",
+                "Icons/ScriptCanvas/Viewport/ScriptCanvas.png",
                 AZ::Color(0.321f, 0.302f, 0.164f, 1.0f),
                 true
             )

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetTypes.h

@@ -15,4 +15,4 @@
 namespace ScriptCanvasEditor
 {
 
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h

@@ -36,4 +36,4 @@ namespace ScriptCanvas
     private:
         ScriptCanvasData(const ScriptCanvasData&) = delete;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorSceneVariableManagerBus.h

@@ -34,4 +34,4 @@ namespace ScriptCanvasEditor
     };
 
     using EditorSceneVariableManagerRequestBus = AZ::EBus<EditorSceneVariableManagerRequests>;
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/GraphBus.h

@@ -28,4 +28,4 @@ namespace ScriptCanvasEditor
     };
 
     using GeneralGraphEventBus = AZ::EBus<GeneralGraphEvents>;
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/IconBus.h

@@ -30,4 +30,4 @@ namespace ScriptCanvasEditor
     };
     
     using IconBus = AZ::EBus<IconRequests>;
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/NodeIdPair.h

@@ -26,4 +26,4 @@ namespace ScriptCanvasEditor
             , m_scriptCanvasId(AZ::EntityId::InvalidEntityId)
         {}
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraphVariableManagerComponent.h

@@ -99,4 +99,4 @@ namespace ScriptCanvasEditor
 
         EditorGraphVariableItemModel m_variableModel;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorUtils.h

@@ -53,4 +53,4 @@ namespace ScriptCanvasEditor
 
         void RegisterNodeType(const ScriptCanvas::NodeTypeIdentifier& nodeTypeIdentifier);
     };        
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/DynamicSlotBus.h

@@ -31,4 +31,4 @@ namespace ScriptCanvasEditor
     };
 
     using DynamicSlotRequestBus = AZ::EBus<DynamicSlotRequests>;
-}
+}

Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/MappingBus.h

@@ -51,4 +51,4 @@ namespace ScriptCanvasEditor
     };
 
     using SceneMemberMappingRequestBus = AZ::EBus<SceneMemberMappingRequests>;
-}
+}

Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.h

@@ -42,4 +42,4 @@ namespace ScriptCanvasEditor
         void Activate() override;
         void Deactivate() override;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp

@@ -100,7 +100,7 @@ namespace ScriptCanvasEditor
                 }
                 else
                 {
-                    QString defaultIcon = QStringLiteral("Editor/Icons/ScriptCanvas/Libraries/All.png");
+                    QString defaultIcon = QStringLiteral("Icons/ScriptCanvas/Libraries/All.png");
                     return QVariant(QIcon(defaultIcon));
                 }
 

Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.h

@@ -57,4 +57,4 @@ namespace ScriptCanvasEditor
             DataSet m_data;
         };
     }
-}
+}

Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp

@@ -23,7 +23,7 @@ namespace ScriptCanvasEditor
 
     UnitTestBrowserFilterModel::UnitTestBrowserFilterModel(QObject* parent)
         : AssetBrowserFilterModel(parent)
-        , m_iconRunning("Editor/Icons/AssetBrowser/in_progress.gif")
+        , m_iconRunning("Icons/AssetBrowser/in_progress.gif")
         , m_iconFailedToCompile     (":/ScriptCanvasEditorResources/Resources/warning_symbol.png")
         , m_iconFailedToCompileOld  (":/ScriptCanvasEditorResources/Resources/warning_symbol_grey.png")
         , m_iconPassed              (":/ScriptCanvasEditorResources/Resources/valid_icon.png")

Gems/ScriptCanvas/Code/Editor/Nodes/EditorLibrary.cpp

@@ -35,7 +35,7 @@ namespace ScriptCanvasEditor
                 {
                     editContext->Class<Editor>("Editor", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/All.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/All.png")
                         ;
                 }
             }

Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.cpp

@@ -167,7 +167,7 @@ namespace ScriptCanvasEditor::Nodes
         return nodeIdPair;
     }
 
-    NodeIdPair CreateObjectMethodNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId)
+    NodeIdPair CreateObjectMethodNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, ScriptCanvas::PropertyStatus propertyStatus)
     {
         AZ_PROFILE_TIMER("ScriptCanvas", __FUNCTION__);
         NodeIdPair nodeIds;
@@ -181,7 +181,7 @@ namespace ScriptCanvasEditor::Nodes
         auto* methodNode = azrtti_cast<ScriptCanvas::Nodes::Core::Method*>(node);
 
         ScriptCanvas::NamespacePath emptyNamespacePath;
-        methodNode->InitializeBehaviorMethod(emptyNamespacePath, className, methodName);
+        methodNode->InitializeBehaviorMethod(emptyNamespacePath, className, methodName, propertyStatus);
 
         AZStd::string_view displayName = methodNode->GetName();
         scriptCanvasEntity->SetName(AZStd::string::format("SC-Node(%.*s)", aznumeric_cast<int>(displayName.size()), displayName.data()));
@@ -208,7 +208,7 @@ namespace ScriptCanvasEditor::Nodes
         auto* methodNode = azrtti_cast<ScriptCanvas::Nodes::Core::MethodOverloaded*>(node);
 
         ScriptCanvas::NamespacePath emptyNamespacePath;
-        methodNode->InitializeBehaviorMethod(emptyNamespacePath, className, methodName);
+        methodNode->InitializeBehaviorMethod(emptyNamespacePath, className, methodName, ScriptCanvas::PropertyStatus::None);
 
         AZStd::string_view displayName = methodNode->GetName();
         scriptCanvasEntity->SetName(AZStd::string::format("SC-Node(%.*s)", aznumeric_cast<int>(displayName.size()), displayName.data()));

Gems/ScriptCanvas/Code/Editor/Nodes/NodeCreateUtils.h

@@ -34,7 +34,7 @@ namespace ScriptCanvasEditor::Nodes
     AZStd::pair<ScriptCanvas::Node*, NodeIdPair> CreateAndGetNode(const AZ::Uuid& classData, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, const StyleConfiguration& styleConfiguration, AZStd::function<void(ScriptCanvas::Node*)> = nullptr);
     NodeIdPair CreateNode(const AZ::Uuid& classData, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, const StyleConfiguration& styleConfiguration);
     NodeIdPair CreateEntityNode(const AZ::EntityId& sourceId, const ScriptCanvas::ScriptCanvasId& scriptCanvasId);
-    NodeIdPair CreateObjectMethodNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId);
+    NodeIdPair CreateObjectMethodNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId, ScriptCanvas::PropertyStatus propertyStatus);
     NodeIdPair CreateObjectMethodOverloadNode(AZStd::string_view className, AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasGraphId);
     NodeIdPair CreateGlobalMethodNode(AZStd::string_view methodName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId);
     NodeIdPair CreateEbusWrapperNode(AZStd::string_view busName, const ScriptCanvas::ScriptCanvasId& scriptCanvasId);

Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp

@@ -327,12 +327,14 @@ namespace ScriptCanvasEditor::Nodes
             contextGroup = TranslationContextGroup::EbusSender;
             break;
         case ScriptCanvas::MethodType::Member:
+        case ScriptCanvas::MethodType::Getter:
+        case ScriptCanvas::MethodType::Setter:
         case ScriptCanvas::MethodType::Free:
             graphCanvasEntity->CreateComponent<ClassMethodNodeDescriptorComponent>();
             contextGroup = TranslationContextGroup::ClassMethod;
             break;
         default:
-            AZ_Error("ScriptCanvas", false, "Invalid method node type, node creation failed. This node nodes to be deleted.");
+            AZ_Error("ScriptCanvas", false, "Invalid method node type, node creation failed. This node needs to be deleted.");
             break;
         }
 

Gems/ScriptCanvas/Code/Editor/Nodes/ScriptCanvasAssetNode.cpp

@@ -50,7 +50,7 @@ namespace ScriptCanvasEditor
         {
             editContext->Class<ScriptCanvasAssetNode>("ScriptCanvas Asset", "Script Canvas Asset Node which contains a reference to another ScriptCanvas graph")
                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/ScriptCanvas/Placeholder.png")
+                ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/Placeholder.png")
                 ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::List)
                 ;
         }

Gems/ScriptCanvas/Code/Editor/QtMetaTypes.h

@@ -22,4 +22,4 @@ AZ_POP_DISABLE_WARNING
 Q_DECLARE_METATYPE(AZ::Uuid);
 Q_DECLARE_METATYPE(AZ::Data::AssetId);
 Q_DECLARE_METATYPE(ScriptCanvas::Data::Type);
-Q_DECLARE_METATYPE(ScriptCanvas::VariableId);
+Q_DECLARE_METATYPE(ScriptCanvas::VariableId);

Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.h

@@ -129,4 +129,4 @@ namespace ScriptCanvasEditor
     }
 }
 
-#include <ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.inl>
+#include <ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.inl>

Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.inl

@@ -124,4 +124,4 @@ namespace ScriptCanvasEditor
         }
         return false;
     }
-}
+}

Gems/ScriptCanvas/Code/Editor/Static/Source/View/EditCtrls/GenericLineEditCtrl.cpp

@@ -92,4 +92,4 @@ namespace ScriptCanvasEditor
     }
 }
 
-#include <Editor/Static/Include/ScriptCanvas/View/EditCtrls/moc_GenericLineEditCtrl.cpp>
+#include <Editor/Static/Include/ScriptCanvas/View/EditCtrls/moc_GenericLineEditCtrl.cpp>

Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp

@@ -134,7 +134,7 @@ namespace ScriptCanvasEditor
 
         PopulateEditorCreatableTypes();
 
-        m_propertyHandlers.emplace_back(AzToolsFramework::RegisterGenericComboBoxHandler<ScriptCanvas::VariableId>());
+        AzToolsFramework::RegisterGenericComboBoxHandler<ScriptCanvas::VariableId>();
 
         SystemRequestBus::Handler::BusConnect();
         ScriptCanvasExecutionBus::Handler::BusConnect();
@@ -177,12 +177,6 @@ namespace ScriptCanvasEditor
         SystemRequestBus::Handler::BusDisconnect();
         AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
 
-        for (auto&& propertyHandler : m_propertyHandlers)
-        {
-            AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(&AzToolsFramework::PropertyTypeRegistrationMessages::UnregisterPropertyType, propertyHandler.get());
-        }
-        m_propertyHandlers.clear();
-
         m_jobContext.reset();
         m_jobManager.reset();
         m_assetTracker.Deactivate();
@@ -320,7 +314,7 @@ namespace ScriptCanvasEditor
     {
         if (AZStd::wildcard_match("*.scriptcanvas", fullSourceFileName))
         {
-            return AzToolsFramework::AssetBrowser::SourceFileDetails("Editor/Icons/AssetBrowser/ScriptCanvas_16.png");
+            return AzToolsFramework::AssetBrowser::SourceFileDetails("Icons/AssetBrowser/ScriptCanvas_16.png");
         }
 
         // not one of our types.

Gems/ScriptCanvas/Code/Editor/SystemComponent.h

@@ -147,7 +147,6 @@ namespace ScriptCanvasEditor
         AZStd::unique_ptr<AZ::JobManager> m_jobManager;
         AZStd::unique_ptr<AZ::JobContext> m_jobContext;
 
-        AZStd::vector<AZStd::unique_ptr<AzToolsFramework::PropertyHandlerBase>> m_propertyHandlers;
         AZStd::unordered_set<ScriptCanvas::Data::Type> m_creatableTypes;
 
         AssetTracker m_assetTracker;

Gems/ScriptCanvas/Code/Editor/Utilities/Command.cpp

@@ -16,4 +16,4 @@
 namespace ScriptCanvasEditor
 {
 
-}
+}

Gems/ScriptCanvas/Code/Editor/Utilities/Command.h

@@ -30,4 +30,4 @@ namespace ScriptCanvasEditor
         AZStd::string m_category;
         AZStd::string m_iconPath;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.cpp

@@ -37,4 +37,4 @@ namespace ScriptCanvasEditor
 
         return resultValue;
     }
-}
+}

Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h

@@ -18,4 +18,4 @@
 namespace ScriptCanvasEditor
 {
     AZStd::string GetEditingGameDataFolder();
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.h

@@ -153,4 +153,4 @@ namespace ScriptCanvasEditor
 
         GraphCanvas::StateSetter<bool> m_disableHidingStateSetter;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.h

@@ -125,4 +125,4 @@ namespace ScriptCanvasEditor
 
         AZStd::unique_ptr< Ui::ContainerWizard > m_ui;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.cpp

@@ -53,4 +53,4 @@ namespace ScriptCanvasEditor
     }
 
     #include <Editor/View/Dialogs/moc_NewGraphDialog.cpp>
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.h

@@ -43,4 +43,4 @@ namespace ScriptCanvasEditor
 
         Ui::NewGraphDialog* ui;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.h

@@ -96,4 +96,4 @@ namespace ScriptCanvasEditor
 
         Ui::SettingsDialog* ui;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.cpp

@@ -51,4 +51,4 @@ namespace ScriptCanvasEditor
     }
 
 #include <Editor/View/Dialogs/moc_UnsavedChangesDialog.cpp>
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.h

@@ -51,4 +51,4 @@ namespace ScriptCanvasEditor
         Ui::UnsavedChangesDialog* ui;
         UnsavedChangesOptions m_result = UnsavedChangesOptions::INVALID;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/AssetGraphSceneDataBus.h

@@ -26,4 +26,4 @@ namespace ScriptCanvasEditor
 
     using AssetGraphSceneBus = AZ::EBus<AssetGraphScene>;
 
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.ui

@@ -121,4 +121,4 @@
       <header>Editor/View/Widgets/CommandLine.h</header>
     </customwidget>
   </customwidgets>
-</ui>
+</ui>

Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.h

@@ -102,4 +102,4 @@ namespace ScriptCanvasEditor
 
     }
 
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.cpp

@@ -50,4 +50,4 @@ namespace ScriptCanvasEditor
     }
     
 #include <Editor/View/Widgets/LoggingPanel/AssetWindowSession/moc_LoggingAssetWindowSession.cpp>
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.h

@@ -41,4 +41,4 @@ namespace ScriptCanvasEditor
     
         LoggingAssetDataAggregator m_dataAggregator;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.h

@@ -140,4 +140,4 @@ namespace ScriptCanvasEditor
         ScriptCanvas::Debugger::Target m_targetConfiguration;
         AZStd::intrusive_ptr<LiveLoggingUserSettings> m_userSettings;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.cpp

@@ -15,4 +15,4 @@
 
 namespace ScriptCanvasEditor
 {
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.h

@@ -31,4 +31,4 @@ namespace ScriptCanvasEditor
     typedef AZStd::unordered_multimap<AZ::NamedEntityId, ScriptCanvas::GraphIdentifier> LoggingEntityMap;
     typedef AZStd::unordered_set<ScriptCanvas::GraphIdentifier> LoggingAssetSet;
     typedef AZ::EntityId LoggingDataId;
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.cpp

@@ -480,4 +480,4 @@ namespace ScriptCanvasEditor
     }
 
 #include <Editor/View/Widgets/LoggingPanel/moc_LoggingWindowSession.cpp>
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.h

@@ -145,4 +145,4 @@ namespace ScriptCanvasEditor
         AZ::Data::AssetId m_assetId;
         AZ::EntityId m_assetNodeId;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.h

@@ -121,4 +121,4 @@ namespace ScriptCanvasEditor
     public:
         EntityPivotTreeWidget(QWidget* parent);
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.h

@@ -176,4 +176,4 @@ namespace ScriptCanvasEditor
     public:
         GraphPivotTreeWidget(QWidget* parent);
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.h

@@ -205,4 +205,4 @@ namespace ScriptCanvasEditor
         GraphCanvas::GraphCanvasTreeModel* m_treeModel;
         PivotTreeSortProxyModel* m_proxyModel;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.cpp

@@ -43,4 +43,4 @@ namespace ScriptCanvasEditor
     }
 
 #include <Editor/View/Widgets/moc_MainWindowStatusWidget.cpp>
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.h

@@ -52,4 +52,4 @@ namespace ScriptCanvasEditor
     private:
         AZStd::unique_ptr<Ui::MainWindowStatusWidget> m_ui;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h

@@ -76,4 +76,4 @@ namespace ScriptCanvasEditor
 
         virtual AZStd::vector< GraphCanvas::GraphCanvasMimeEvent* > CreateMimeEvents() const = 0;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.cpp

@@ -52,14 +52,16 @@ namespace ScriptCanvasEditor
                 ->Field("BusName", &CreateEBusSenderMimeEvent::m_busName)
                 ->Field("EventName", &CreateEBusSenderMimeEvent::m_eventName)
                 ->Field("IsOverload", &CreateEBusSenderMimeEvent::m_isOverload)
+                ->Field("propertyStatus", &CreateEBusSenderMimeEvent::m_propertyStatus)
                 ;
         }
     }
 
-    CreateEBusSenderMimeEvent::CreateEBusSenderMimeEvent(AZStd::string_view busName, AZStd::string_view eventName, bool isOverload)
+    CreateEBusSenderMimeEvent::CreateEBusSenderMimeEvent(AZStd::string_view busName, AZStd::string_view eventName, bool isOverload, ScriptCanvas::PropertyStatus propertyStatus)
         : m_busName(busName.data())
         , m_eventName(eventName.data())
         , m_isOverload(isOverload)
+        , m_propertyStatus(propertyStatus)
     {
     }
 
@@ -71,7 +73,7 @@ namespace ScriptCanvasEditor
         }
         else
         {
-            return Nodes::CreateObjectMethodNode(m_busName, m_eventName, scriptCanvasId);
+            return Nodes::CreateObjectMethodNode(m_busName, m_eventName, scriptCanvasId, m_propertyStatus);
         }
     }
 
@@ -91,13 +93,14 @@ namespace ScriptCanvasEditor
         return defaultIcon;
     }
 
-    EBusSendEventPaletteTreeItem::EBusSendEventPaletteTreeItem(AZStd::string_view busName, AZStd::string_view eventName, const ScriptCanvas::EBusBusId& busIdentifier, const ScriptCanvas::EBusEventId& eventIdentifier, bool isOverload)
+    EBusSendEventPaletteTreeItem::EBusSendEventPaletteTreeItem(AZStd::string_view busName, AZStd::string_view eventName, const ScriptCanvas::EBusBusId& busIdentifier, const ScriptCanvas::EBusEventId& eventIdentifier, bool isOverload, ScriptCanvas::PropertyStatus propertyStatus)
         : DraggableNodePaletteTreeItem(eventName, ScriptCanvasEditor::AssetEditorId)
         , m_busName(busName.data())
         , m_eventName(eventName.data())
         , m_busId(busIdentifier)
         , m_eventId(eventIdentifier)
         , m_isOverload(isOverload)
+        , m_propertyStatus(propertyStatus)
     {
         AZStd::string displayEventName = TranslationHelper::GetKeyTranslation(TranslationContextGroup::EbusSender, m_busName.toUtf8().data(), m_eventName.toUtf8().data(), TranslationItemType::Node, TranslationKeyId::Name);
 
@@ -122,7 +125,7 @@ namespace ScriptCanvasEditor
 
     GraphCanvas::GraphCanvasMimeEvent* EBusSendEventPaletteTreeItem::CreateMimeEvent() const
     {
-        return aznew CreateEBusSenderMimeEvent(m_busName.toUtf8().data(), m_eventName.toUtf8().data(), m_isOverload);
+        return aznew CreateEBusSenderMimeEvent(m_busName.toUtf8().data(), m_eventName.toUtf8().data(), m_isOverload, ScriptCanvas::PropertyStatus::None);
     }
 
     AZStd::string EBusSendEventPaletteTreeItem::GetBusName() const
@@ -145,6 +148,11 @@ namespace ScriptCanvasEditor
         return m_eventId;
     }
 
+    ScriptCanvas::PropertyStatus EBusSendEventPaletteTreeItem::GetPropertyStatus() const
+    {
+        return m_propertyStatus;
+    }
+
     bool EBusSendEventPaletteTreeItem::IsOverload() const 
     {
         return m_isOverload;

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.h

@@ -28,7 +28,7 @@ namespace ScriptCanvasEditor
         static void Reflect(AZ::ReflectContext* reflectContext);
 
         CreateEBusSenderMimeEvent() = default;
-        CreateEBusSenderMimeEvent(AZStd::string_view busName, AZStd::string_view eventName, bool isOverload);
+        CreateEBusSenderMimeEvent(AZStd::string_view busName, AZStd::string_view eventName, bool isOverload, ScriptCanvas::PropertyStatus propertyStatus);
         ~CreateEBusSenderMimeEvent() = default;
 
     protected:
@@ -36,6 +36,7 @@ namespace ScriptCanvasEditor
         
     private:
         bool m_isOverload;
+        ScriptCanvas::PropertyStatus m_propertyStatus = ScriptCanvas::PropertyStatus::None;
         AZStd::string m_busName;
         AZStd::string m_eventName;
     };
@@ -50,7 +51,7 @@ namespace ScriptCanvasEditor
         AZ_CLASS_ALLOCATOR(EBusSendEventPaletteTreeItem, AZ::SystemAllocator, 0);
         AZ_RTTI(EBusSendEventPaletteTreeItem, "{26258B0A-8E2C-434D-ACAD-3DE85E64A4F8}", GraphCanvas::DraggableNodePaletteTreeItem);
 
-        EBusSendEventPaletteTreeItem(AZStd::string_view busName, AZStd::string_view eventName, const ScriptCanvas::EBusBusId& busId, const ScriptCanvas::EBusEventId& eventIdentifier, bool isOverload);
+        EBusSendEventPaletteTreeItem(AZStd::string_view busName, AZStd::string_view eventName, const ScriptCanvas::EBusBusId& busId, const ScriptCanvas::EBusEventId& eventIdentifier, bool isOverload, ScriptCanvas::PropertyStatus propertyStatus);
         ~EBusSendEventPaletteTreeItem() = default;
         
         GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
@@ -63,6 +64,8 @@ namespace ScriptCanvasEditor
 
         bool IsOverload() const;
 
+        ScriptCanvas::PropertyStatus GetPropertyStatus() const;
+
     private:
         bool m_isOverload;
         QString m_busName;
@@ -70,6 +73,7 @@ namespace ScriptCanvasEditor
 
         ScriptCanvas::EBusBusId   m_busId;
         ScriptCanvas::EBusEventId m_eventId;
+        ScriptCanvas::PropertyStatus m_propertyStatus = ScriptCanvas::PropertyStatus::None;
     };
     
     // </EbusSender>
@@ -163,4 +167,4 @@ namespace ScriptCanvasEditor
     };
     
     // </EbusHandlerEvent>
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp

@@ -51,14 +51,16 @@ namespace ScriptCanvasEditor
                 ->Field("ClassName", &CreateClassMethodMimeEvent::m_className)
                 ->Field("MethodName", &CreateClassMethodMimeEvent::m_methodName)
                 ->Field("IsOverload", &CreateClassMethodMimeEvent::m_isOverload)
+                ->Field("propertyStatus", &CreateClassMethodMimeEvent::m_propertyStatus)
                 ;
         }
     }
 
-    CreateClassMethodMimeEvent::CreateClassMethodMimeEvent(const QString& className, const QString& methodName, bool isOverload)
+    CreateClassMethodMimeEvent::CreateClassMethodMimeEvent(const QString& className, const QString& methodName, bool isOverload, ScriptCanvas::PropertyStatus propertyStatus)
         : m_className(className.toUtf8().data())
         , m_methodName(methodName.toUtf8().data())
         , m_isOverload(isOverload)
+        , m_propertyStatus(propertyStatus)
     {
     }
 
@@ -70,7 +72,7 @@ namespace ScriptCanvasEditor
         }
         else
         {
-            return Nodes::CreateObjectMethodNode(m_className, m_methodName, scriptCanvasId);
+            return Nodes::CreateObjectMethodNode(m_className, m_methodName, scriptCanvasId, m_propertyStatus);
         }
     }
 
@@ -78,11 +80,12 @@ namespace ScriptCanvasEditor
     // ClassMethodEventPaletteTreeItem
     ////////////////////////////////////
 
-    ClassMethodEventPaletteTreeItem::ClassMethodEventPaletteTreeItem(AZStd::string_view className, AZStd::string_view methodName, bool isOverload)
+    ClassMethodEventPaletteTreeItem::ClassMethodEventPaletteTreeItem(AZStd::string_view className, AZStd::string_view methodName, bool isOverload, ScriptCanvas::PropertyStatus propertyStatus)
         : DraggableNodePaletteTreeItem(methodName, ScriptCanvasEditor::AssetEditorId)
         , m_className(className.data())
         , m_methodName(methodName.data())
         , m_isOverload(isOverload)
+        , m_propertyStatus(propertyStatus)
     {
         AZStd::string displayMethodName = TranslationHelper::GetKeyTranslation(TranslationContextGroup::ClassMethod, m_className.toUtf8().data(), m_methodName.toUtf8().data(), TranslationItemType::Node, TranslationKeyId::Name);
 
@@ -95,6 +98,15 @@ namespace ScriptCanvasEditor
             SetName(displayMethodName.c_str());
         }
 
+        if (propertyStatus == ScriptCanvas::PropertyStatus::Getter)
+        {
+            SetName(AZStd::string::format("Get %s", GetName().toUtf8().data()).data());
+        }
+        else if (propertyStatus == ScriptCanvas::PropertyStatus::Setter)
+        {
+            SetName(AZStd::string::format("Set %s", GetName().toUtf8().data()).data());
+        }
+
         AZStd::string displayEventTooltip = TranslationHelper::GetKeyTranslation(TranslationContextGroup::ClassMethod, m_className.toUtf8().data(), m_methodName.toUtf8().data(), TranslationItemType::Node, TranslationKeyId::Tooltip);
 
         if (!displayEventTooltip.empty())
@@ -107,7 +119,7 @@ namespace ScriptCanvasEditor
 
     GraphCanvas::GraphCanvasMimeEvent* ClassMethodEventPaletteTreeItem::CreateMimeEvent() const
     {
-        return aznew CreateClassMethodMimeEvent(m_className, m_methodName, m_isOverload);
+        return aznew CreateClassMethodMimeEvent(m_className, m_methodName, m_isOverload, m_propertyStatus);
     }
 
     AZStd::string ClassMethodEventPaletteTreeItem::GetClassMethodName() const
@@ -125,6 +137,11 @@ namespace ScriptCanvasEditor
         return m_isOverload;
     }
 
+    ScriptCanvas::PropertyStatus ClassMethodEventPaletteTreeItem::GetPropertyStatus() const
+    {
+        return m_propertyStatus;
+    }
+
     //! Implementation of the CreateGlobalMethod Mime Event
     void CreateGlobalMethodMimeEvent::Reflect(AZ::ReflectContext* reflectContext)
     {

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h

@@ -30,7 +30,7 @@ namespace ScriptCanvasEditor
         static void Reflect(AZ::ReflectContext* reflectContext);
 
         CreateClassMethodMimeEvent() = default;
-        CreateClassMethodMimeEvent(const QString& className, const QString& methodName, bool isOverload);
+        CreateClassMethodMimeEvent(const QString& className, const QString& methodName, bool isOverload, ScriptCanvas::PropertyStatus);
         ~CreateClassMethodMimeEvent() = default;
 
     protected:
@@ -40,6 +40,7 @@ namespace ScriptCanvasEditor
         bool m_isOverload = false;
         AZStd::string m_className;
         AZStd::string m_methodName;
+        ScriptCanvas::PropertyStatus m_propertyStatus = ScriptCanvas::PropertyStatus::None;
     };
 
     class ClassMethodEventPaletteTreeItem
@@ -49,7 +50,7 @@ namespace ScriptCanvasEditor
         AZ_CLASS_ALLOCATOR(ClassMethodEventPaletteTreeItem, AZ::SystemAllocator, 0);
         AZ_RTTI(ClassMethodEventPaletteTreeItem, "{96F93970-F38A-4F08-8DC5-D52FCCE34E25}", GraphCanvas::DraggableNodePaletteTreeItem);
 
-        ClassMethodEventPaletteTreeItem(AZStd::string_view className, AZStd::string_view methodName, bool isOverload);
+        ClassMethodEventPaletteTreeItem(AZStd::string_view className, AZStd::string_view methodName, bool isOverload, ScriptCanvas::PropertyStatus propertyStatus);
         ~ClassMethodEventPaletteTreeItem() = default;
 
         GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
@@ -57,11 +58,13 @@ namespace ScriptCanvasEditor
         AZStd::string GetClassMethodName() const;
         AZStd::string GetMethodName() const;
         bool IsOverload() const;
+        ScriptCanvas::PropertyStatus GetPropertyStatus() const;
 
     private:
         bool m_isOverload = false;
         QString m_className;
         QString m_methodName;
+        ScriptCanvas::PropertyStatus m_propertyStatus = ScriptCanvas::PropertyStatus::None;
     };
     // </ClassMethod>
 
@@ -150,4 +153,4 @@ namespace ScriptCanvasEditor
     };
 
     // </CustomNode>
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp

@@ -129,6 +129,7 @@ namespace
         , const AZ::BehaviorClass* behaviorClass
         , const AZStd::string& name
         , const AZ::BehaviorMethod& method
+        , ScriptCanvas::PropertyStatus propertyStatus
         , bool isOverloaded)
     {
         if (IsDeprecated(method.m_attributes))
@@ -170,7 +171,7 @@ namespace
             serializeContext->RegisterType(resultParameter->m_typeId, AZStd::move(classData), EventPlaceholderAnyCreator);
 
         }
-        nodePaletteModel.RegisterClassNode(categoryPath, behaviorClass ? behaviorClass->m_name : "", name, &method, &behaviorContext, isOverloaded);
+        nodePaletteModel.RegisterClassNode(categoryPath, behaviorClass ? behaviorClass->m_name : "", name, &method, &behaviorContext, propertyStatus, isOverloaded);
     }
 
     void RegisterGlobalMethod(ScriptCanvasEditor::NodePaletteModel& nodePaletteModel, const AZ::BehaviorContext& behaviorContext,
@@ -558,9 +559,14 @@ namespace
 
                 for (auto property : behaviorClass->m_properties)
                 {
+                    if (property.second->m_getter)
+                    {
+                        RegisterMethod(nodePaletteModel, behaviorContext, categoryPath, behaviorClass, property.first, *property.second->m_getter, ScriptCanvas::PropertyStatus::Getter, behaviorClass->IsMethodOverloaded(property.first));
+                    }
+
                     if (property.second->m_setter)
                     {
-                        RegisterMethod(nodePaletteModel, behaviorContext, categoryPath, behaviorClass, property.first, *property.second->m_setter, behaviorClass->IsMethodOverloaded(property.first));
+                        RegisterMethod(nodePaletteModel, behaviorContext, categoryPath, behaviorClass, property.first, *property.second->m_setter, ScriptCanvas::PropertyStatus::Setter, behaviorClass->IsMethodOverloaded(property.first));
                     }
                 }
 
@@ -575,7 +581,7 @@ namespace
                             continue;
                         }
 
-                        RegisterMethod(nodePaletteModel, behaviorContext, categoryPath, behaviorClass, methodIter.first, *methodIter.second, behaviorClass->IsMethodOverloaded(methodIter.first));
+                        RegisterMethod(nodePaletteModel, behaviorContext, categoryPath, behaviorClass, methodIter.first, *methodIter.second, ScriptCanvas::PropertyStatus::None, behaviorClass->IsMethodOverloaded(methodIter.first));
                     }
                 }
             }
@@ -587,7 +593,7 @@ namespace
     {
         for (const AZ::ExplicitOverloadInfo& explicitOverload : behaviorContext.m_explicitOverloads)
         {
-            RegisterMethod(nodePaletteModel, behaviorContext, explicitOverload.m_categoryPath, nullptr, explicitOverload.m_name, *explicitOverload.m_overloads.begin()->first, true);
+            RegisterMethod(nodePaletteModel, behaviorContext, explicitOverload.m_categoryPath, nullptr, explicitOverload.m_name, *explicitOverload.m_overloads.begin()->first, ScriptCanvas::PropertyStatus::None, true);
         }
     }
 
@@ -725,7 +731,7 @@ namespace
                 }
 
                 const bool isOverload{ false }; // overloaded events are not trivially supported
-                nodePaletteModel.RegisterEBusSenderNodeModelInformation(categoryPath, behaviorEbus.m_name, event.first, ScriptCanvas::EBusBusId(behaviorEbus.m_name.c_str()), ScriptCanvas::EBusEventId(event.first.c_str()), event.second, isOverload);
+                nodePaletteModel.RegisterEBusSenderNodeModelInformation(categoryPath, behaviorEbus.m_name, event.first, ScriptCanvas::EBusBusId(behaviorEbus.m_name.c_str()), ScriptCanvas::EBusEventId(event.first.c_str()), event.second, ScriptCanvas::PropertyStatus::None, isOverload);
             }
         }
     }
@@ -1032,11 +1038,16 @@ namespace ScriptCanvasEditor
         }
     }
 
-    void NodePaletteModel::RegisterClassNode(const AZStd::string& categoryPath, const AZStd::string& methodClass,
-        const AZStd::string& methodName, const AZ::BehaviorMethod* behaviorMethod, const AZ::BehaviorContext* behaviorContext,
-        bool isOverload)
+    void NodePaletteModel::RegisterClassNode
+        ( const AZStd::string& categoryPath
+        , const AZStd::string& methodClass
+        , const AZStd::string& methodName
+        , const AZ::BehaviorMethod* behaviorMethod
+        , const AZ::BehaviorContext* behaviorContext
+        , ScriptCanvas::PropertyStatus propertyStatus
+        , bool isOverload)
     {
-        ScriptCanvas::NodeTypeIdentifier nodeIdentifier = isOverload ? ScriptCanvas::NodeUtils::ConstructMethodOverloadedNodeIdentifier(methodName) : ScriptCanvas::NodeUtils::ConstructMethodNodeIdentifier(methodClass, methodName);
+        ScriptCanvas::NodeTypeIdentifier nodeIdentifier = isOverload ? ScriptCanvas::NodeUtils::ConstructMethodOverloadedNodeIdentifier(methodName) : ScriptCanvas::NodeUtils::ConstructMethodNodeIdentifier(methodClass, methodName, propertyStatus);
 
         auto registerIter = m_registeredNodes.find(nodeIdentifier);
 
@@ -1047,7 +1058,7 @@ namespace ScriptCanvasEditor
             methodModelInformation->m_nodeIdentifier = nodeIdentifier;
             methodModelInformation->m_classMethod = methodClass;
             methodModelInformation->m_methodName = methodName;
-
+            methodModelInformation->m_propertyStatus = propertyStatus;
             methodModelInformation->m_titlePaletteOverride = "MethodNodeTitlePalette";
 
             methodModelInformation->m_displayName = TranslationHelper::GetKeyTranslation(TranslationContextGroup::ClassMethod, methodClass.c_str(), methodName.c_str(), TranslationItemType::Node, TranslationKeyId::Name);
@@ -1206,7 +1217,15 @@ namespace ScriptCanvasEditor
         }
     }
 
-    void NodePaletteModel::RegisterEBusSenderNodeModelInformation(AZStd::string_view categoryPath, AZStd::string_view busName, AZStd::string_view eventName, const ScriptCanvas::EBusBusId& busId, const ScriptCanvas::EBusEventId& eventId, const AZ::BehaviorEBusEventSender&, bool isOverload)
+    void NodePaletteModel::RegisterEBusSenderNodeModelInformation
+        ( AZStd::string_view categoryPath
+        , AZStd::string_view busName
+        , AZStd::string_view eventName
+        , const ScriptCanvas::EBusBusId& busId
+        , const ScriptCanvas::EBusEventId& eventId
+        , const AZ::BehaviorEBusEventSender&
+        , ScriptCanvas::PropertyStatus propertyStatus
+        , bool isOverload)
     {
         ScriptCanvas::NodeTypeIdentifier nodeIdentifier = isOverload ? ScriptCanvas::NodeUtils::ConstructEBusEventSenderOverloadedIdentifier(busId, eventId) : ScriptCanvas::NodeUtils::ConstructEBusEventSenderIdentifier(busId, eventId);
 
@@ -1220,6 +1239,7 @@ namespace ScriptCanvasEditor
             senderInformation->m_titlePaletteOverride = "MethodNodeTitlePalette";
             senderInformation->m_categoryPath = categoryPath;
             senderInformation->m_nodeIdentifier = nodeIdentifier;
+            senderInformation->m_propertyStatus = propertyStatus;
 
             senderInformation->m_busName = busName;
             senderInformation->m_eventName = eventName;

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h

@@ -83,12 +83,12 @@ namespace ScriptCanvasEditor
         void RepopulateModel();
 
         void RegisterCustomNode(AZStd::string_view categoryPath, const AZ::Uuid& uuid, AZStd::string_view name, const AZ::SerializeContext::ClassData* classData);
-        void RegisterClassNode(const AZStd::string& categoryPath, const AZStd::string& methodClass, const AZStd::string& methodName, const AZ::BehaviorMethod* behaviorMethod, const AZ::BehaviorContext* behaviorContext, bool isOverload);
+        void RegisterClassNode(const AZStd::string& categoryPath, const AZStd::string& methodClass, const AZStd::string& methodName, const AZ::BehaviorMethod* behaviorMethod, const AZ::BehaviorContext* behaviorContext, ScriptCanvas::PropertyStatus propertyStatus, bool isOverload);
         void RegisterMethodNode(const AZ::BehaviorContext& behaviorContext, const AZ::BehaviorMethod& behaviorMethod);
         void RegisterGlobalConstant(const AZ::BehaviorContext& behaviorContext, const AZ::BehaviorMethod& behaviorMethod);
 
         void RegisterEBusHandlerNodeModelInformation(AZStd::string_view categoryPath, AZStd::string_view busName, AZStd::string_view eventName, const ScriptCanvas::EBusBusId& busId, const AZ::BehaviorEBusHandler::BusForwarderEvent& forwardEvent);
-        void RegisterEBusSenderNodeModelInformation(AZStd::string_view categoryPath, AZStd::string_view busName, AZStd::string_view eventName, const ScriptCanvas::EBusBusId& busId, const ScriptCanvas::EBusEventId& eventId, const AZ::BehaviorEBusEventSender& eventSender, bool isOverload);
+        void RegisterEBusSenderNodeModelInformation(AZStd::string_view categoryPath, AZStd::string_view busName, AZStd::string_view eventName, const ScriptCanvas::EBusBusId& busId, const ScriptCanvas::EBusEventId& eventId, const AZ::BehaviorEBusEventSender& eventSender, ScriptCanvas::PropertyStatus propertyStatus, bool isOverload);
 
         // Asset Based Registrations
         AZStd::vector<ScriptCanvas::NodeTypeIdentifier> RegisterScriptEvent(ScriptEvents::ScriptEventsAsset* scriptEventAsset);
@@ -164,6 +164,7 @@ namespace ScriptCanvasEditor
         bool m_isOverload{};
         AZStd::string m_classMethod;
         AZStd::string m_methodName;
+        ScriptCanvas::PropertyStatus m_propertyStatus = ScriptCanvas::PropertyStatus::None;
     };
 
     struct GlobalMethodNodeModelInformation
@@ -202,6 +203,7 @@ namespace ScriptCanvasEditor
 
         ScriptCanvas::EBusBusId m_busId;
         ScriptCanvas::EBusEventId m_eventId;
+        ScriptCanvas::PropertyStatus m_propertyStatus = ScriptCanvas::PropertyStatus::None;
     };
 
     struct ScriptEventHandlerNodeModelInformation

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModelBus.h

@@ -35,4 +35,4 @@ namespace ScriptCanvasEditor
     };
 
     using NodePaletteModelNotificationBus = AZ::EBus<NodePaletteModelNotifications>;
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h

@@ -106,4 +106,4 @@ namespace ScriptCanvasEditor
         GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
     };
     // </NodeGroup>
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.h

@@ -265,4 +265,4 @@ namespace ScriptCanvasEditor
     };
 
     // </VariableNodePaletteTreeItem>
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridBus.h

@@ -30,4 +30,4 @@ namespace ScriptCanvasEditor
     };
     
     using PropertyGridRequestBus = AZ::EBus<PropertyGridRequests>;
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp

@@ -111,7 +111,7 @@ namespace ScriptCanvasEditor
                 }
                 else if (auto methodNodeModelInformation = azrtti_cast<const MethodNodeModelInformation*>(modelInformation))
                 {
-                    createdItem = parentItem->CreateChildNode<ScriptCanvasEditor::ClassMethodEventPaletteTreeItem>(methodNodeModelInformation->m_classMethod, methodNodeModelInformation->m_methodName, methodNodeModelInformation->m_isOverload);
+                    createdItem = parentItem->CreateChildNode<ScriptCanvasEditor::ClassMethodEventPaletteTreeItem>(methodNodeModelInformation->m_classMethod, methodNodeModelInformation->m_methodName, methodNodeModelInformation->m_isOverload, methodNodeModelInformation->m_propertyStatus);
                 }
                 else if (auto globalMethodNodeModelInformation = azrtti_cast<const GlobalMethodNodeModelInformation*>(modelInformation);
                     globalMethodNodeModelInformation != nullptr)
@@ -130,7 +130,7 @@ namespace ScriptCanvasEditor
                 {
                     if (!azrtti_istypeof<const ScriptEventSenderNodeModelInformation*>(ebusSenderNodeModelInformation))
                     {
-                        createdItem = parentItem->CreateChildNode<ScriptCanvasEditor::EBusSendEventPaletteTreeItem>(ebusSenderNodeModelInformation->m_busName, ebusSenderNodeModelInformation->m_eventName, ebusSenderNodeModelInformation->m_busId, ebusSenderNodeModelInformation->m_eventId, ebusSenderNodeModelInformation->m_isOverload);
+                        createdItem = parentItem->CreateChildNode<ScriptCanvasEditor::EBusSendEventPaletteTreeItem>(ebusSenderNodeModelInformation->m_busName, ebusSenderNodeModelInformation->m_eventName, ebusSenderNodeModelInformation->m_busId, ebusSenderNodeModelInformation->m_eventId, ebusSenderNodeModelInformation->m_isOverload, ebusSenderNodeModelInformation->m_propertyStatus);
                     }
                 }
 

Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp

@@ -119,4 +119,4 @@ namespace ScriptCanvasEditor
         m_filter->SetHoveredIndex(QModelIndex());
     }
     
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.h

@@ -63,4 +63,4 @@ namespace ScriptCanvasEditor
         AzToolsFramework::AssetBrowser::AssetBrowserModel* m_model;
         UnitTestBrowserFilterModel* m_filter;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidgetBus.h

@@ -27,4 +27,4 @@ namespace ScriptCanvasEditor
     };
 
     using GraphValidatorDockWidgetNotificationBus = AZ::EBus<GraphValidatorDockWidgetNotifications>;    
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp

@@ -80,6 +80,13 @@ namespace ScriptCanvasEditor
         QObject::connect(ui->slotName, &QLineEdit::returnPressed, this, &SlotTypeSelectorWidget::OnReturnPressed);
         QObject::connect(ui->slotName, &QLineEdit::textChanged, this, &SlotTypeSelectorWidget::OnNameChanged);
         QObject::connect(ui->variablePalette, &QTableView::clicked, this, [this]() { ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); });
+        QObject::connect(ui->variablePalette, &VariablePaletteTableView::CreateNamedVariable, this, [this](const AZStd::string& variableName, const ScriptCanvas::Data::Type& variableType)
+            {
+                // only emitted on container types
+                OnCreateVariable(variableType);
+                OnNameChanged(variableName.c_str());
+                accept();
+            });
 
         // Tell the widget to auto create our context menu, for now
         setContextMenuPolicy(Qt::ActionsContextMenu);

Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.h

@@ -79,4 +79,4 @@ namespace ScriptCanvasEditor
 
         QCompleter*                             m_completer;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Widgets/WidgetBus.h

@@ -26,4 +26,4 @@ namespace ScriptCanvasEditor
 
     using WidgetNotificationBus = AZ::EBus<WidgetNotification>;
 
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.h

@@ -122,4 +122,4 @@ namespace ScriptCanvasEditor
         EBusHandlerActionSourceModel* m_model;
         Ui::EBusHandlerActionListWidget* m_listWidget;
     };
-}
+}

Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp

@@ -448,7 +448,7 @@ namespace ScriptCanvasEditor
         GraphCanvas::AssetEditorAutomationRequestBus::Handler::BusConnect(ScriptCanvasEditor::AssetEditorId);
 
         AZStd::array<char, AZ::IO::MaxPathLength> unresolvedPath;
-        AZ::IO::FileIOBase::GetInstance()->ResolvePath("@assets@/editor/translation/scriptcanvas_en_us.qm", unresolvedPath.data(), unresolvedPath.size());
+        AZ::IO::FileIOBase::GetInstance()->ResolvePath("@assets@/translation/scriptcanvas_en_us.qm", unresolvedPath.data(), unresolvedPath.size());
 
         QString translationFilePath(unresolvedPath.data());
         if ( m_translator.load(QLocale::Language::English, translationFilePath) )