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
@@ -363,8 +363,6 @@ void CAnimSceneNode::Animate(SAnimContext& ec)
        bTimeJump = true;
    */

-    int nCurrentSoundTrackIndex = 0;
-
    if (gEnv->IsEditor() && m_time > ec.time)
    {
        m_lastPrecachePoint = -1.f;
@@ -1095,7 +1093,7 @@ void CAnimSceneNode::PrecacheDynamic(float time)
                CSelectTrack* pCameraTrack = static_cast<CSelectTrack*>(pAnimTrack);

                ISelectKey key;
-                int keyID = pCameraTrack->GetActiveKey(time + fPrecacheCameraTime, &key);
+                pCameraTrack->GetActiveKey(time + fPrecacheCameraTime, &key);

                if (time < key.time && (time + fPrecacheCameraTime) > key.time && key.time > m_lastPrecachePoint)
                {