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

Merge branch 'stabilization/2106' into mbalfour/gitflow_210622

Browse Source 
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
This commit is contained in:
mbalfour
2021-06-22 12:55:18 -05:00
parent c1b6bb122e d5490ecf69
commit df648db62e
184 changed files with 17071 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
+20 -5
View File
@@ -2177,7 +2177,10 @@ namespace ScriptCanvas
{
for (auto& latent : nodeableParse.second->m_latents)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(latent.second));
if (latent.second)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(latent.second));
}
}
}
@@ -2185,23 +2188,35 @@ namespace ScriptCanvas
{
for (auto& event : eventHandlerParse.second->m_events)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(event.second));
if (event.second)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(event.second));
}
}
}
for (auto& eventHandlerParse : m_eventHandlingByNode)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(eventHandlerParse.second->m_eventHandlerFunction));
if (eventHandlerParse.second->m_eventHandlerFunction)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(eventHandlerParse.second->m_eventHandlerFunction));
}
}
for (auto variableWriteHandling : m_variableWriteHandlingBySlot)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(variableWriteHandling.second->m_function));
if (variableWriteHandling.second->m_function)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(variableWriteHandling.second->m_function));
}
}
for (auto function : m_functions)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(function));
if (function)
{
roots.push_back(AZStd::const_pointer_cast<ExecutionTree>(function));
}
}
return roots;