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

LYN-8403 Prevent the same Surface Tag from getting reused

Gems/SurfaceData/Code/Include/SurfaceData/SurfaceTag.h

@@ -19,7 +19,8 @@ namespace SurfaceData
     {
     public:
         AZ_CLASS_ALLOCATOR(SurfaceTag, AZ::SystemAllocator, 0);
-        AZ_RTTI(SurfaceTag, "{67C8C6ED-F32A-443E-A777-1CAE48B22CD7}");
+        AZ_TYPE_INFO(SurfaceTag, "{67C8C6ED-F32A-443E-A777-1CAE48B22CD7}");
+
         static void Reflect(AZ::ReflectContext* context);
 
         SurfaceTag()
@@ -47,6 +48,8 @@ namespace SurfaceData
             m_surfaceTagCrc = AZ::Crc32(value.data());
         }
 
+        AZStd::string GetDisplayName() const;
+
         static AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> GetRegisteredTags();
 
     private:
@@ -54,8 +57,6 @@ namespace SurfaceData
 
         AZStd::vector<AZStd::pair<AZ::u32, AZStd::string>> BuildSelectableTagList() const;
 
-        AZStd::string GetDisplayName() const;
-
         AZ::u32 m_surfaceTagCrc;
     };