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
@@ -117,7 +117,8 @@ void CProfileLogSystem::SetTime(ILogElement* pElement, float time)
        return;
    }

-    if (m_pLastElelent = pElement->SetTime(time))
+    m_pLastElelent = pElement->SetTime(time);
+    if (m_pLastElelent)
    {
        return;
    }
@@ -130,4 +131,4 @@ void CProfileLogSystem::SetTime(ILogElement* pElement, float time)
 void CProfileLogSystem::Release()
 {
    delete this;
-}
+}