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,39 +1285,40 @@ namespace GraphCanvas
     void SceneComponent::ReadSaveData(const EntitySaveDataContainer& saveDataContainer)
     {
         GRAPH_CANVAS_PROFILE_FUNCTION();
-        const SceneComponentSaveData* saveData = saveDataContainer.FindSaveDataAs<SceneComponentSaveData>();
-
-        for (const GraphCanvasConstructSaveData* currentConstruct : saveData->m_constructs)
+        if (const SceneComponentSaveData* saveData = saveDataContainer.FindSaveDataAs<SceneComponentSaveData>())
         {
-            AZ::Entity* constructEntity = nullptr;
-            switch (currentConstruct->m_constructType)
+            for (const GraphCanvasConstructSaveData* currentConstruct : saveData->m_constructs)
             {
-            case ConstructType::CommentNode:
-                GraphCanvasRequestBus::BroadcastResult(constructEntity, &GraphCanvasRequests::CreateCommentNode);
-                break;
-            case ConstructType::NodeGroup:
-                GraphCanvasRequestBus::BroadcastResult(constructEntity, &GraphCanvasRequests::CreateNodeGroup);
-                break;
-            case ConstructType::BookmarkAnchor:
-                GraphCanvasRequestBus::BroadcastResult(constructEntity, &GraphCanvasRequests::CreateBookmarkAnchor);
-                break;
-            default:
-                break;
-            }
+                AZ::Entity* constructEntity = nullptr;
+                switch (currentConstruct->m_constructType)
+                {
+                case ConstructType::CommentNode:
+                    GraphCanvasRequestBus::BroadcastResult(constructEntity, &GraphCanvasRequests::CreateCommentNode);
+                    break;
+                case ConstructType::NodeGroup:
+                    GraphCanvasRequestBus::BroadcastResult(constructEntity, &GraphCanvasRequests::CreateNodeGroup);
+                    break;
+                case ConstructType::BookmarkAnchor:
+                    GraphCanvasRequestBus::BroadcastResult(constructEntity, &GraphCanvasRequests::CreateBookmarkAnchor);
+                    break;
+                default:
+                    break;
+                }
 
-            if (constructEntity)
-            {
-                constructEntity->Init();
-                constructEntity->Activate();
+                if (constructEntity)
+                {
+                    constructEntity->Init();
+                    constructEntity->Activate();
 
-                EntitySaveDataRequestBus::Event(constructEntity->GetId(), &EntitySaveDataRequests::ReadSaveData, currentConstruct->m_saveDataContainer);
+                    EntitySaveDataRequestBus::Event(constructEntity->GetId(), &EntitySaveDataRequests::ReadSaveData, currentConstruct->m_saveDataContainer);
 
-                Add(constructEntity->GetId());
+                    Add(constructEntity->GetId());
+                }
             }
-        }
 
-        m_viewParams = saveData->m_viewParams;
-        m_bookmarkCounter = saveData->m_bookmarkCounter;
+            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();