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

Merge pull request #1433 from aws-lumberyard-dev/carlito/stabilization/2106

Browse Source 
Remove any null entries from AbstractCodeModel::ModAllRoots() LYN-4658
This commit is contained in:
carlitosan
2021-06-18 12:48:36 -07:00
committed by GitHub
parent 04f6c7b90f d907c14682
commit 7c52274370
1 changed files with 20 additions and 5 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;