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

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

Browse Source 
Fixed group and bookmark display on graph load
This commit is contained in:
Luis Sempé
2022-02-08 09:06:35 -08:00
committed by GitHub
parent 44172d532d 1b52339b6b
commit b669878ef6
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp
+29 -28
View File
@@ -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();
EntitySaveDataRequestBus::Event(constructEntity->GetId(), &EntitySaveDataRequests::ReadSaveData, currentConstruct->m_saveDataContainer);
Add(constructEntity->GetId());
}
}
if (constructEntity)
{
constructEntity->Init();
constructEntity->Activate();
EntitySaveDataRequestBus::Event(constructEntity->GetId(), &EntitySaveDataRequests::ReadSaveData, currentConstruct->m_saveDataContainer);
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
+2 -4
View File
@@ -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();