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
@@ -477,7 +477,6 @@ namespace Serialization {
{
while (isComment(*cur.end))
{
const char* commentStart = ptr;
while (*cur.end && *cur.end != '\n')
{
++cur.end;
@@ -969,7 +968,10 @@ namespace Serialization {
ser(*this);
CRY_ASSERT(!stack_.empty());
stack_.pop_back();
bool closed = closeBracket();
#if !defined(NDEBUG)
bool closed =
#endif
closeBracket();
CRY_ASSERT(closed);
return true;
}