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
@@ -430,7 +430,6 @@ public:
    // Update simulation
    void Update(SWaterUpdateThreadInfo& pThreadInfo)
    {
-        int nFrameID = pThreadInfo.nFrameID;
        float fTime = pThreadInfo.fTime;
        bool bOnlyHeight = pThreadInfo.bOnlyHeight;

@@ -522,7 +521,6 @@ public:
    {
        AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Renderer);

-        CRenderer* rd = gRenDev;

        m_nFillThreadID = m_nWorkerThreadID = 0;