Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -275,8 +275,6 @@ namespace ScriptCanvasDeveloperEditor
// Attempt to assign the current set of variable types.
for (; i < slotOrdering.size(); ++i)
{
const ScriptCanvas::SlotId& prototypeId = slotOrdering[i];
auto groupDataIter = groupDataTypes.find(slotOrdering[i]);
auto transientSlotIter = prototypeIdentifiers.find(slotOrdering[i]);
@@ -339,7 +337,6 @@ namespace ScriptCanvasDeveloperEditor
// Reset all of the previous variable ids if we failed.
for (int r = 0; r < i; ++r)
{
const ScriptCanvas::SlotId& prototypeId = slotOrdering[r];
auto transientSlotIter = prototypeIdentifiers.find(slotOrdering[r]);
if (transientSlotIter != prototypeIdentifiers.end())
@@ -106,8 +106,6 @@ namespace ScriptCanvasDeveloperEditor
categoryName = categoryAttribute->Get(nullptr);
}
bool canCreate = serializeContext->FindClassData(behaviorClass->m_typeId) != nullptr;
for (auto methodPair : behaviorClass->m_methods)
{
// Check for "ignore" attribute for ScriptCanvas