Fix for unconverted once nodes

main
chcurran 5 years ago
parent 9f7f6e84a4
commit 2fd985f162

@ -3764,6 +3764,12 @@ namespace ScriptCanvas
nextSlot = onceResetSlot; nextSlot = onceResetSlot;
} }
if (!nextSlot)
{
AddError(ID.m_node->GetEntityId(), once, "Once node missing next slot, likely needs replacement");
return;
}
ParseExecutionTreeBody(nextParse, *nextSlot); ParseExecutionTreeBody(nextParse, *nextSlot);
nextParse->MarkDebugEmptyStatement(); nextParse->MarkDebugEmptyStatement();
} }

@ -928,6 +928,7 @@ namespace ScriptCanvas
{ {
return execution->GetId().m_node return execution->GetId().m_node
&& IsOnce(*execution->GetId().m_node) && IsOnce(*execution->GetId().m_node)
&& execution->GetId().m_slot
&& execution->GetId().m_slot->GetType() == CombinedSlotType::ExecutionIn; && execution->GetId().m_slot->GetType() == CombinedSlotType::ExecutionIn;
} }
@ -938,7 +939,7 @@ namespace ScriptCanvas
bool IsOnceReset(const Node& node, const Slot* slot) bool IsOnceReset(const Node& node, const Slot* slot)
{ {
return slot = OnceProperty::GetResetSlot(&node); return slot == OnceProperty::GetResetSlot(&node);
} }
bool IsOperatorArithmetic(const ExecutionTreeConstPtr& execution) bool IsOperatorArithmetic(const ExecutionTreeConstPtr& execution)

Loading…
Cancel
Save