merging latest main

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-20 17:26:11 -07:00
parent bf113bb5d1 d7e29c00c7
commit 1000a07b3f
2 changed files with 3 additions and 3 deletions
@@ -64,7 +64,7 @@ namespace Multiplayer
        void OnDeactivate(Multiplayer::EntityIsMigrating entityIsMigrating) override;

    private:
-        void OnPreRender(float deltaTime, float blendFactor);
+        void OnPreRender(float deltaTime);
        void OnTransformUpdate(const AZ::Transform& transform);
        void OnSyncRewind();