merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-20 13:28:57 -07:00
parent 8401ee409b e4479fff4a
commit 011bd5d10e
257 changed files with 8431 additions and 7127 deletions
@@ -395,9 +395,9 @@ namespace Multiplayer
        m_entityServerMigrationEvent.Signal(m_netEntityHandle, hostId, connectionId);
    }

-    void NetBindComponent::NotifyPreRender(float deltaTime, float blendFactor)
+    void NetBindComponent::NotifyPreRender(float deltaTime)
    {
-        m_entityPreRenderEvent.Signal(deltaTime, blendFactor);
+        m_entityPreRenderEvent.Signal(deltaTime);
    }

    void NetBindComponent::NotifyCorrection()