Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -55,7 +55,7 @@ namespace Maestro

        // Don't RemoveEntityToAnimate if we are in the middle of an Undo event.
        // Doing so will create will mark this entity dirty and break the undo system.
-        if (!isDuringUndo)
+        if (!isDuringUndo && m_sequence)
        {
            for (int i = m_sequence->GetNodeCount(); --i >= 0;)
            {