Merge pull request #7476 from aws-lumberyard-dev/scripting/fix_groups

Fixed group and bookmark display on graph load

Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp

@@ -1285,8 +1285,8 @@ namespace GraphCanvas
     void SceneComponent::ReadSaveData(const EntitySaveDataContainer& saveDataContainer)
     {
         GRAPH_CANVAS_PROFILE_FUNCTION();
-        const SceneComponentSaveData* saveData = saveDataContainer.FindSaveDataAs<SceneComponentSaveData>();
-
+        if (const SceneComponentSaveData* saveData = saveDataContainer.FindSaveDataAs<SceneComponentSaveData>())
+        {
             for (const GraphCanvasConstructSaveData* currentConstruct : saveData->m_constructs)
             {
                 AZ::Entity* constructEntity = nullptr;
@@ -1319,6 +1319,7 @@ namespace GraphCanvas
             m_viewParams = saveData->m_viewParams;
             m_bookmarkCounter = saveData->m_bookmarkCounter;
         }
+    }
 
     AZStd::any* SceneComponent::GetUserData()
     {

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

@@ -3543,11 +3543,9 @@ namespace ScriptCanvasEditor
 
             GraphCanvas::SceneRequestBus::Event(graphCanvasGraphId, &GraphCanvas::SceneRequests::SignalLoadStart);
 
-            auto saveDataIter = m_graphCanvasSaveData.find(GetEntityId());
-
-            if (saveDataIter != m_graphCanvasSaveData.end())
+            for (auto& saveDataIter : m_graphCanvasSaveData)
             {
-                GraphCanvas::EntitySaveDataRequestBus::Event(graphCanvasGraphId, &GraphCanvas::EntitySaveDataRequests::ReadSaveData, (*saveDataIter->second));
+                GraphCanvas::EntitySaveDataRequestBus::Event(graphCanvasGraphId, &GraphCanvas::EntitySaveDataRequests::ReadSaveData, (*saveDataIter.second));
             }
 
             ScriptCanvas::NodeIdList nodeList = GetNodes();