Merge branch 'development' into cmake/win_fix_warn_4296

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Code/Legacy/CryCommon/HeightmapUpdateNotificationBus.h

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/EBus/EBus.h>
-#include <AzCore/Math/Aabb.h>
-
-namespace AZ
-{
-    /**
-    * the EBus is used to request information about potential vegetation surfaces
-    */
-    class HeightmapUpdateNotification
-        : public AZ::EBusTraits
-    {
-    public:
-        ////////////////////////////////////////////////////////////////////////
-        // EBusTraits
-        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
-        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
-        ////////////////////////////////////////////////////////////////////////
-
-        // Occurs when the terrain height map is modified.
-        virtual void HeightmapModified(const AZ::Aabb& bounds) = 0;
-    };
-
-    typedef AZ::EBus<HeightmapUpdateNotification> HeightmapUpdateNotificationBus;
-}

Code/Legacy/CryCommon/crycommon_files.cmake

@@ -53,7 +53,6 @@ set(FILES
     HMDBus.h
     VRCommon.h
     StereoRendererBus.h
-    HeightmapUpdateNotificationBus.h
     INavigationSystem.h
     IMNM.h
     SFunctor.h

Code/Legacy/CrySystem/XConsole.cpp

@@ -3133,6 +3133,9 @@ char* CXConsole::GetCheatVarAt(uint32 nOffset)
 //////////////////////////////////////////////////////////////////////////
 size_t CXConsole::GetSortedVars(AZStd::vector<AZStd::string_view>& pszArray, const char* szPrefix)
 {
+    // This method used to insert instead of push_back, so we need to clear first
+    pszArray.clear();
+
     size_t iPrefixLen = szPrefix ? strlen(szPrefix) : 0;
 
     // variables