Merge branch 'main' into JsonSerializationTypeIdBug

2021-04-28 09:23:41 -07:00
parent 0f8e6cbda1 167b7f36a6
commit 2dfe9942f2
904 changed files with 48338 additions and 67222 deletions
@@ -118,6 +118,7 @@ namespace AZ
            const static AZ::Crc32 StringLineEditingCompleteNotify = AZ_CRC("StringLineEditingCompleteNotify", 0x139e5fa9);

            const static AZ::Crc32 NameLabelOverride = AZ_CRC("NameLabelOverride", 0x9ff79cab);
+            const static AZ::Crc32 AssetPickerTitle = AZ_CRC_CE("AssetPickerTitle");
            const static AZ::Crc32 ChildNameLabelOverride = AZ_CRC("ChildNameLabelOverride", 0x73dd2909);
            //! Container attribute that is used to override labels for its elements given the index of the element
            const static AZ::Crc32 IndexedChildNameLabelOverride = AZ_CRC("IndexedChildNameLabelOverride", 0x5f313ac2);