Merge branch 'development' into cmake/warn_virtual

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Legacy/CryCommon/IConsole.h # Code/Legacy/CrySystem/LocalizedStringManager.h # Code/Legacy/CrySystem/XConsole.h # Code/Legacy/CrySystem/XConsoleVariable.h # Code/Legacy/CrySystem/XML/XmlUtils.cpp # cmake/Platform/Common/Clang/Configurations_clang.cmake
2021-09-07 18:42:40 -07:00
parent a72b8a025f 6b5b82717d
commit c805d443d2
228 changed files with 1196 additions and 16357 deletions
@@ -81,8 +81,6 @@ public:

            ID = shakeID;
        }
-
-        void GetMemoryUsage([[maybe_unused]] ICrySizer* pSizer) const { /*nothing*/}
    };


@@ -111,8 +109,6 @@ public:
    CCamera& GetCamera() override { return m_camera; }
    const CCamera& GetCamera() const override { return m_camera; }

-    void GetMemoryUsage(ICrySizer* s) const;
-
 protected:

    void ProcessShakeNormal(SShake* pShake, float frameTime);