Merge pull request #7040 from aws-lumberyard-dev/TerrainMaterialsFix

LYN-7640 Terrain Physics Materials hooked up all the way down to PhysX

Code/Framework/AzFramework/AzFramework/Physics/HeightfieldProviderBus.h

@@ -35,16 +35,15 @@ namespace Physics
         {
         }
 
-        virtual ~HeightMaterialPoint() = default;
+        ~HeightMaterialPoint() = default;
 
         static void Reflect(AZ::ReflectContext* context);
 
-        AZ_RTTI(HeightMaterialPoint, "{DF167ED4-24E6-4F7B-8AB7-42622F7DBAD3}");
+        AZ_TYPE_INFO(HeightMaterialPoint, "{DF167ED4-24E6-4F7B-8AB7-42622F7DBAD3}");
         float m_height{ 0.0f }; //!< Holds the height of this point in the heightfield relative to the heightfield entity location.
         QuadMeshType m_quadMeshType{ QuadMeshType::SubdivideUpperLeftToBottomRight }; //!< By default, create two triangles like this |\|, where this point is in the upper left corner.
         uint8_t m_materialIndex{ 0 }; //!< The surface material index for the upper left corner of this quad.
         uint16_t m_padding{ 0 }; //!< available for future use.
-
     };
 
     //! An interface to provide heightfield values.