Merge branch 'main' into Atom/dmcdiar/ATOM-15517

2021-06-02 00:10:55 -07:00
parent 982c30eefd 0f699cfd47
commit 35d7ee5e53
182 changed files with 5870 additions and 2129 deletions
@@ -184,7 +184,7 @@ namespace AZ
            void MaterialPropertyInspector::AddUvNamesGroup()
            {
                const AZStd::string groupNameId = AZ::RPI::UvGroupName;
-                const AZStd::string groupDisplayName = "UV Names";
+                const AZStd::string groupDisplayName = "UV Sets";
                const AZStd::string groupDescription = "UV set names in this material, which can be renamed to match those in the model.";
                auto& group = m_groups[groupNameId];