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
@@ -313,7 +313,10 @@ void CXmlHistoryManager::RecordUndo(IXmlUndoEventHandler* pEventHandler, const c
    assert(pChangedXml);

    XmlNodeRef newData = gEnv->pSystem->CreateXmlNode();
-    bool bRes = pEventHandler->SaveToXml(newData);
+#if !defined(NDEBUG)
+    bool bRes =
+#endif
+        pEventHandler->SaveToXml(newData);
    assert(bRes);

    TXmlHistotyGroupPtrList activeGroups = m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups;